September 2016 - tor-commits - lists.torproject.org

[tor-browser-bundle/maint-6.0] Fix bug in changelog
by gk＠torproject.org 20 Sep '16

20 Sep '16

commit ae4e1c26e4dd6ba37fa7b930c28b6a2c9db4d5ca Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 20 14:23:01 2016 +0000 Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index a8f341b..ecb6572 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.0.5 -- September 16 * Update Firefox to 45.4.0esr * Update Tor to 0.2.8.7 * Update Torbutton to 1.9.5.7 - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Update HTTPS-Everywhere to 5.2.4 * Bug 20092: Rotate ports for default obfs4 bridges

1 0

[tor-browser-bundle/hardened-builds] Fix bug in changelog
by gk＠torproject.org 20 Sep '16

20 Sep '16

commit 369588783e9ffb3b2441e226696798df395382f4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 20 14:22:22 2016 +0000 Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 20f120b..ff3164f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,7 +6,7 @@ Tor Browser 6.5a3 -- September 20 2016 * Update Torbutton to 1.9.6.4 * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git * Bug 17767: Make "JavaScript disabled" more visible in Security Slider - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Bug 19837: Whitelist internal URLs that Firefox requires for media * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic

1 0

[tor-browser-bundle/master] Fix bug in changelog
by gk＠torproject.org 20 Sep '16

20 Sep '16

commit 7014b0ff1e63b01353801c40d2db9a7c54970182 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 20 14:17:01 2016 +0000 Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 302f5d5..881f25f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,7 +6,7 @@ Tor Browser 6.5a3 -- September 20 2016 * Update Torbutton to 1.9.6.4 * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git * Bug 17767: Make "JavaScript disabled" more visible in Security Slider - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Bug 19837: Whitelist internal URLs that Firefox requires for media * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic @@ -42,7 +42,7 @@ Tor Browser 6.0.5 -- September 16 * Update Firefox to 45.4.0esr * Update Tor to 0.2.8.7 * Update Torbutton to 1.9.5.7 - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Update HTTPS-Everywhere to 5.2.4 * Bug 20092: Rotate ports for default obfs4 bridges

1 0

[snowflake/master] initial client roundtrip estimate on broker
by serene＠torproject.org 20 Sep '16

20 Sep '16

commit 47e1338290359755308825ca66008e2df94cab60 Author: Serene H <git(a)keroserene.net> Date: Tue Sep 20 06:26:21 2016 -0700 initial client roundtrip estimate on broker --- broker/broker.go | 25 ++++++++++++++++++------- broker/metrics.go | 17 +++++++++++++++++ client/torrc | 2 +- proxy/snowflake.coffee | 1 + 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 3c50ac9..3561141 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -26,6 +26,7 @@ type BrokerContext struct { // the second http POST. idToSnowflake map[string]*Snowflake proxyPolls chan *ProxyPoll + metrics *Metrics } func NewBrokerContext() *BrokerContext { @@ -35,6 +36,7 @@ func NewBrokerContext() *BrokerContext { snowflakes: snowflakes, idToSnowflake: make(map[string]*Snowflake), proxyPolls: make(chan *ProxyPoll), + metrics: new(Metrics), } } @@ -67,7 +69,7 @@ func (ctx *BrokerContext) RequestOffer(id string) []byte { request.id = id request.offerChannel = make(chan []byte) ctx.proxyPolls <- request - // Block until an offer is available... + // Block until an offer is available, or timeout which sends a nil offer. offer := <-request.offerChannel return offer } @@ -96,6 +98,8 @@ func (ctx *BrokerContext) Broker() { } // Create and add a Snowflake to the heap. +// Required to keep track of proxies between providing them +// with an offer and awaiting their second POST with an answer. func (ctx *BrokerContext) AddSnowflake(id string) *Snowflake { snowflake := new(Snowflake) snowflake.id = id @@ -141,29 +145,32 @@ snowflake proxy, which responds with the SDP answer to be sent in the HTTP response back to the client. */ func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { + startTime := time.Now() offer, err := ioutil.ReadAll(r.Body) if nil != err { log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) return } - - // Find the most available snowflake proxy, and pass the offer to it. - // TODO: Needs improvement - maybe shouldn't immediately fail? + // Immediately fail if there are no snowflakes available. if ctx.snowflakes.Len() <= 0 { log.Println("Client: No snowflake proxies available.") w.WriteHeader(http.StatusServiceUnavailable) return } + // Otherwise, find the most available snowflake proxy, and pass the offer to it. snowflake := heap.Pop(ctx.snowflakes).(*Snowflake) - defer delete(ctx.idToSnowflake, snowflake.id) + delete(ctx.idToSnowflake, snowflake.id) snowflake.offerChannel <- offer - // Wait for the answer to be returned on the channel. + // Wait for the answer to be returned on the channel or timeout. select { case answer := <-snowflake.answerChannel: log.Println("Client: Retrieving answer") w.Write(answer) + // Initial tracking of elapsed time. + ctx.metrics.clientRoundtripEstimate = time.Since(startTime) / + time.Millisecond case <-time.After(time.Second * ClientTimeout): log.Println("Client: Timed out.") w.WriteHeader(http.StatusGatewayTimeout) @@ -196,7 +203,11 @@ func proxyAnswers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { } func debugHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { - s := fmt.Sprintf("current: %d", ctx.snowflakes.Len()) + s := fmt.Sprintf("current snowflakes available: %d\n", ctx.snowflakes.Len()) + for _, snowflake := range ctx.idToSnowflake { + s += fmt.Sprintf("\nsnowflake %d: %s", snowflake.index, snowflake.id) + } + s += fmt.Sprintf("\n\nroundtrip avg: %d", ctx.metrics.clientRoundtripEstimate) w.Write([]byte(s)) } diff --git a/broker/metrics.go b/broker/metrics.go new file mode 100644 index 0000000..f64d1cc --- /dev/null +++ b/broker/metrics.go @@ -0,0 +1,17 @@ +package snowflake_broker + +import ( + // "golang.org/x/net/internal/timeseries" + "time" +) + +// Implements Observable +type Metrics struct { + // snowflakes timeseries.Float + clientRoundtripEstimate time.Duration +} + +func NewMetrics() *Metrics { + m := new(Metrics) + return m +} diff --git a/client/torrc b/client/torrc index d066454..6912760 100644 --- a/client/torrc +++ b/client/torrc @@ -5,6 +5,6 @@ ClientTransportPlugin snowflake exec ./client \ -url https://snowflake-reg.appspot.com/ \ -front www.google.com \ -ice stun:stun.l.google.com:19302 \ --max 1 +-max 3 Bridge snowflake 0.0.3.0:1 diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index c16694c..8877470 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -125,6 +125,7 @@ class Snowflake try offer = JSON.parse desc dbg 'Received:\n\n' + offer.sdp + '\n' + console.log offer sdp = new SessionDescription offer @sendAnswer pair if pair.receiveWebRTCOffer sdp catch e

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 20 Sep '16

20 Sep '16

commit aa62c74a1a99063863062b66df7f47c87dd9ef44 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 20 10:46:33 2016 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 8600bce..d54eda20 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -47,7 +47,7 @@ <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。"> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "禁用 MathML。"> <!ENTITY torbutton.prefs.sec_med_high "中高"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "在开启 JavaScript 的站点上禁用性能优化。"> <!ENTITY torbutton.prefs.sec_font_rend_desc "禁用某些字体渲染功能。"> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "禁用 Graphite 字体渲染。"> <!ENTITY torbutton.prefs.sec_svg_desc "禁用某些图像类型。">

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 20 Sep '16

20 Sep '16

commit 9fc1096147c346fb5ecf16e141b62dcfc7a09295 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 20 10:18:11 2016 +0000 Update translations for tor-messenger-prefsdtd --- zh_CN/prefs.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/prefs.dtd b/zh_CN/prefs.dtd index ea67639..066dcac 100644 --- a/zh_CN/prefs.dtd +++ b/zh_CN/prefs.dtd @@ -13,10 +13,10 @@ <!ENTITY prefs.verifyNudge "总是提醒联系人身份验证。"> <!ENTITY prefs.emptyAccountList "未配置任何账号"> <!ENTITY prefs.generate "生成"> -<!ENTITY prefs.coniksConnection "Connection"> -<!ENTITY prefs.coniksServerAddress "Server Address"> -<!ENTITY prefs.coniksServerPort "Port"> -<!ENTITY prefs.coniksAccountPolicy "Account Policy"> +<!ENTITY prefs.coniksConnection "连接"> +<!ENTITY prefs.coniksServerAddress "服务器地址"> +<!ENTITY prefs.coniksServerPort "端口"> +<!ENTITY prefs.coniksAccountPolicy "账户政策"> <!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> <!ENTITY prefs.coniksPrivateLookups "Private lookups"> <!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file

1 0

[stem/master] Stacktrace when queue module is present
by atagar＠torproject.org 20 Sep '16

20 Sep '16

commit 03f32518527070f4584aa52b7ce2ea11028cc2ba Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 19 22:12:30 2016 -0700 Stacktrace when queue module is present When running with the python 2.x if you have the queue module we use io.StringIO rather than StringIO.StringIO. This causes two of our Controller's methods to fail with... Traceback (most recent call last): File "circuits.py", line 7, in <module> for circ in sorted(controller.get_circuits()): File "/usr/lib/python2.7/site-packages/stem/control.py", line 455, in wrapped return func(self, *args, **kwargs) File "/usr/lib/python2.7/site-packages/stem/control.py", line 3284, in get_circuits circ_message = stem.socket.recv_message(StringIO('650 CIRC ' + circ + '\r\n')) TypeError: initial_value must be unicode or None, not str Thanks to mancha for catching this! --- docs/change_log.rst | 4 ++-- stem/control.py | 7 +++---- stem/response/__init__.py | 8 ++------ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 7ae3466..2959f6b 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -3,7 +3,7 @@ Change Log The following is a log of all user-facing changes to Stem, both released and unreleased. For a monthly report on work being done see my `development log -<https://www.atagar.com/log.php>`_. +<http://blog.atagar.com/>`_. * :ref:`versioning` * :ref:`unreleased` @@ -107,7 +107,7 @@ The following are only available within Stem's `git repository * `Comparison of our descriptor parsing libraries <tutorials/mirror_mirror_on_the_wall.html#are-there-any-other-parsing-libraries>`_ * Example for `custom path selection for circuits <tutorials/to_russia_with_love.html#custom-path-selection>`_ (:trac:`8728`) - * Example for `persisting ephemeral hidden service keys <<tutorials/over_the_river.html#ephemeral-hidden-services>`_ + * Example for `persisting ephemeral hidden service keys <tutorials/over_the_river.html#ephemeral-hidden-services>`_ .. _version_1.4: diff --git a/stem/control.py b/stem/control.py index dfa5add..af22c8f 100644 --- a/stem/control.py +++ b/stem/control.py @@ -252,11 +252,10 @@ except ImportError: from stem.util.ordereddict import OrderedDict try: + # Added in 3.x import queue - from io import StringIO except ImportError: import Queue as queue - from StringIO import StringIO import stem.descriptor.microdescriptor import stem.descriptor.reader @@ -3281,7 +3280,7 @@ class Controller(BaseController): response = self.get_info('circuit-status') for circ in response.splitlines(): - circ_message = stem.socket.recv_message(StringIO('650 CIRC ' + circ + '\r\n')) + circ_message = stem.socket.recv_message(io.StringIO(stem.util.str_tools._to_unicode('650 CIRC ' + circ + '\r\n'))) stem.response.convert('EVENT', circ_message, arrived_at = 0) circuits.append(circ_message) @@ -3464,7 +3463,7 @@ class Controller(BaseController): response = self.get_info('stream-status') for stream in response.splitlines(): - message = stem.socket.recv_message(StringIO('650 STREAM ' + stream + '\r\n')) + message = stem.socket.recv_message(io.StringIO(stem.util.str_tools._to_unicode('650 STREAM ' + stream + '\r\n'))) stem.response.convert('EVENT', message, arrived_at = 0) streams.append(message) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index b6715fc..3300d41 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -30,6 +30,7 @@ Parses replies from the control socket. +- pop_mapping - removes and returns the next entry as a KEY=VALUE mapping """ +import io import re import threading @@ -48,11 +49,6 @@ __all__ = [ 'SingleLineResponse', ] -try: - from StringIO import StringIO -except ImportError: - from io import StringIO - KEY_ARG = re.compile('^(\S+)=') # Escape sequences from the 'esc_for_log' function of tor's 'common/util.c'. @@ -157,7 +153,7 @@ class ControlMessage(object): :returns: stem.response.ControlMessage instance """ - msg = stem.socket.recv_message(StringIO(content)) + msg = stem.socket.recv_message(io.StringIO(stem.util.str_tools._to_unicode(content))) if msg_type is not None: convert(msg_type, msg, **kwargs)

1 0

[tor/master] Simplify the crypto_cipher_t interface and structure
by nickm＠torproject.org 19 Sep '16

19 Sep '16

commit ff116b780896bb735f887a669d87694bb6d8a964 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 16 10:12:30 2016 -0400 Simplify the crypto_cipher_t interface and structure Previously, the IV and key were stored in the structure, even though they mostly weren't needed. The only purpose they had was to support a seldom-used API where you could pass NULL when creating a cipher in order to get a random key/IV, and then pull that key/IV back out. This saves 32 bytes per AES instance, and makes it easier to support different key lengths. --- src/common/crypto.c | 45 +++++++++++++++++---------------------------- src/test/bench.c | 16 +++++++++++----- src/test/test_crypto.c | 9 +++++---- 3 files changed, 33 insertions(+), 37 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 7be43d7..f6ee6b0 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -123,8 +123,6 @@ struct crypto_pk_t /** Key and stream information for a stream cipher. */ struct crypto_cipher_t { - uint8_t key[CIPHER_KEY_LEN]; /**< The raw key. */ - uint8_t iv[CIPHER_IV_LEN]; /**< The initial IV. */ aes_cnt_cipher_t *cipher; /**< The key in format usable for counter-mode AES * encryption */ }; @@ -551,26 +549,18 @@ crypto_pk_free(crypto_pk_t *env) } /** Allocate and return a new symmetric cipher using the provided key and iv. - * The key is CIPHER_KEY_LEN bytes; the IV is CIPHER_IV_LEN bytes. If you - * provide NULL in place of either one, it is generated at random. + * The key is CIPHER_KEY_LEN bytes; the IV is CIPHER_IV_LEN bytes. Both + * must be provided. */ crypto_cipher_t * crypto_cipher_new_with_iv(const char *key, const char *iv) { crypto_cipher_t *env; + tor_assert(key); + tor_assert(iv); - env = tor_malloc_zero(sizeof(crypto_cipher_t)); - - if (key == NULL) - crypto_rand((char*)env->key, CIPHER_KEY_LEN); - else - memcpy(env->key, key, CIPHER_KEY_LEN); - if (iv == NULL) - crypto_rand((char*)env->iv, CIPHER_IV_LEN); - else - memcpy(env->iv, iv, CIPHER_IV_LEN); - - env->cipher = aes_new_cipher(env->key, env->iv, 128); + env = tor_malloc(sizeof(crypto_cipher_t)); + env->cipher = aes_new_cipher((const uint8_t*)key, (const uint8_t*)iv, 128); return env; } @@ -1267,10 +1257,12 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_t *env, tor_assert(tolen >= fromlen + overhead + CIPHER_KEY_LEN); tor_assert(tolen >= pkeylen); - cipher = crypto_cipher_new(NULL); /* generate a new key. */ + char key[CIPHER_KEY_LEN]; + crypto_rand(key, sizeof(key)); /* generate a new key. */ + cipher = crypto_cipher_new(key); buf = tor_malloc(pkeylen+1); - memcpy(buf, cipher->key, CIPHER_KEY_LEN); + memcpy(buf, key, CIPHER_KEY_LEN); memcpy(buf+CIPHER_KEY_LEN, from, pkeylen-overhead-CIPHER_KEY_LEN); /* Length of symmetrically encrypted data. */ @@ -1285,6 +1277,7 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_t *env, if (r<0) goto err; memwipe(buf, 0, pkeylen); + memwipe(key, 0, sizeof(key)); tor_free(buf); crypto_cipher_free(cipher); tor_assert(outlen+symlen < INT_MAX); @@ -1292,6 +1285,7 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_t *env, err: memwipe(buf, 0, pkeylen); + memwipe(key, 0, sizeof(key)); tor_free(buf); crypto_cipher_free(cipher); return -1; @@ -1583,14 +1577,6 @@ crypto_pk_base64_decode(const char *str, size_t len) /* symmetric crypto */ -/** Return a pointer to the key set for the cipher in env. - */ -const char * -crypto_cipher_get_key(crypto_cipher_t *env) -{ - return (const char *)env->key; -} - /** Encrypt fromlen bytes from from using the cipher * env; on success, store the result to to and return 0. * Does not check for failure. @@ -1660,11 +1646,14 @@ crypto_cipher_encrypt_with_iv(const char *key, if (tolen < fromlen + CIPHER_IV_LEN) return -1; - cipher = crypto_cipher_new_with_iv(key, NULL); + char iv[CIPHER_IV_LEN]; + crypto_rand(iv, sizeof(iv)); + cipher = crypto_cipher_new_with_iv(key, iv); - memcpy(to, cipher->iv, CIPHER_IV_LEN); + memcpy(to, iv, CIPHER_IV_LEN); crypto_cipher_encrypt(cipher, to+CIPHER_IV_LEN, from, fromlen); crypto_cipher_free(cipher); + memwipe(iv, 0, sizeof(iv)); return (int)(fromlen + CIPHER_IV_LEN); } diff --git a/src/test/bench.c b/src/test/bench.c index f373019..30984fd 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -90,7 +90,9 @@ bench_aes(void) uint64_t start, end; const int bytes_per_iter = (1<<24); reset_perftime(); - c = crypto_cipher_new(NULL); + char key[CIPHER_KEY_LEN]; + crypto_rand(key, sizeof(key)); + c = crypto_cipher_new(key); for (len = 1; len <= 8192; len *= 2) { int iters = bytes_per_iter / len; @@ -328,8 +330,9 @@ bench_cell_aes(void) char *b = tor_malloc(len+max_misalign); crypto_cipher_t *c; int i, misalign; - - c = crypto_cipher_new(NULL); + char key[CIPHER_KEY_LEN]; + crypto_rand(key, sizeof(key)); + c = crypto_cipher_new(key); reset_perftime(); for (misalign = 0; misalign <= max_misalign; ++misalign) { @@ -501,8 +504,11 @@ bench_cell_ops(void) or_circ->base_.purpose = CIRCUIT_PURPOSE_OR; /* Initialize crypto */ - or_circ->p_crypto = crypto_cipher_new(NULL); - or_circ->n_crypto = crypto_cipher_new(NULL); + char key1[CIPHER_KEY_LEN], key2[CIPHER_KEY_LEN]; + crypto_rand(key1, sizeof(key1)); + crypto_rand(key2, sizeof(key2)); + or_circ->p_crypto = crypto_cipher_new(key1); + or_circ->n_crypto = crypto_cipher_new(key2); or_circ->p_digest = crypto_digest_new(); or_circ->n_digest = crypto_digest_new(); diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index d83b93b..6586c06 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -371,7 +371,7 @@ test_crypto_aes(void *arg) crypto_cipher_t *env1 = NULL, *env2 = NULL; int i, j; char *mem_op_hex_tmp=NULL; - + char key[CIPHER_KEY_LEN]; int use_evp = !strcmp(arg,"evp"); evaluate_evp_for_aes(use_evp); evaluate_ctr_for_aes(); @@ -387,9 +387,10 @@ test_crypto_aes(void *arg) memset(data2, 0, 1024); memset(data3, 0, 1024); - env1 = crypto_cipher_new(NULL); + crypto_rand(key, sizeof(key)); + env1 = crypto_cipher_new(key); tt_ptr_op(env1, OP_NE, NULL); - env2 = crypto_cipher_new(crypto_cipher_get_key(env1)); + env2 = crypto_cipher_new(key); tt_ptr_op(env2, OP_NE, NULL); /* Try encrypting 512 chars. */ @@ -420,7 +421,7 @@ test_crypto_aes(void *arg) env2 = NULL; memset(data3, 0, 1024); - env2 = crypto_cipher_new(crypto_cipher_get_key(env1)); + env2 = crypto_cipher_new(key); tt_ptr_op(env2, OP_NE, NULL); for (j = 0; j < 1024-16; j += 17) { crypto_cipher_encrypt(env2, data3+j, data1+j, 17);

1 0

[tor/master] Merge remote-tracking branch 'public/aes256'
by nickm＠torproject.org 19 Sep '16

19 Sep '16

commit af01e8211e08fd418365f66c79a04e0db5a74aaa Merge: 144bd86 6cb9c2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 19 14:22:27 2016 -0400 Merge remote-tracking branch 'public/aes256' src/common/aes.c | 28 +++++++++------ src/common/aes.h | 3 +- src/common/crypto.c | 98 +++++++++++++++++++++++++------------------------- src/common/crypto.h | 6 +++- src/test/bench.c | 16 ++++++--- src/test/test_crypto.c | 71 ++++++++++++++++++++++++++---------- 6 files changed, 137 insertions(+), 85 deletions(-)

1 0

[tor/master] In aes.c, support 192-bit and 256-bit keys.
by nickm＠torproject.org 19 Sep '16

19 Sep '16

commit 981d0a24b81f27a642946648e49b3cadbd0c28b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 16 09:51:51 2016 -0400 In aes.c, support 192-bit and 256-bit keys. Also, change the input types for aes_new_cipher to be unsigned, as they should have been all along. --- src/common/aes.c | 26 +++++++++++++++++--------- src/common/aes.h | 3 ++- src/common/crypto.c | 13 +++++++------ 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index 2b8a68c..7131ce1 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -89,11 +89,17 @@ ENABLE_GCC_WARNING(redundant-decls) /* We don't actually define the struct here. */ aes_cnt_cipher_t * -aes_new_cipher(const char *key, const char *iv) +aes_new_cipher(const uint8_t *key, const uint8_t *iv, int key_bits) { EVP_CIPHER_CTX *cipher = EVP_CIPHER_CTX_new(); - EVP_EncryptInit(cipher, EVP_aes_128_ctr(), - (const unsigned char*)key, (const unsigned char *)iv); + const EVP_CIPHER *c; + switch (key_bits) { + case 128: c = EVP_aes_128_ctr(); break; + case 192: c = EVP_aes_192_ctr(); break; + case 256: c = EVP_aes_256_ctr(); break; + default: tor_assert(0); // LCOV_EXCL_LINE + } + EVP_EncryptInit(cipher, c, key, iv); return (aes_cnt_cipher_t *) cipher; } void @@ -262,11 +268,11 @@ static void aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv); * using the 128-bit key key and the 128-bit IV iv. */ aes_cnt_cipher_t* -aes_new_cipher(const char *key, const char *iv) +aes_new_cipher(const uint8_t *key, const uint8_t *iv, int bits) { aes_cnt_cipher_t* result = tor_malloc_zero(sizeof(aes_cnt_cipher_t)); - aes_set_key(result, key, 128); + aes_set_key(result, key, bits); aes_set_iv(result, iv); return result; @@ -277,7 +283,7 @@ aes_new_cipher(const char *key, const char *iv) * the counter to 0. */ static void -aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) +aes_set_key(aes_cnt_cipher_t *cipher, const uint8_t *key, int key_bits) { if (should_use_EVP) { const EVP_CIPHER *c = 0; @@ -287,10 +293,10 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) case 256: c = EVP_aes_256_ecb(); break; default: tor_assert(0); // LCOV_EXCL_LINE } - EVP_EncryptInit(&cipher->key.evp, c, (const unsigned char*)key, NULL); + EVP_EncryptInit(&cipher->key.evp, c, key, NULL); cipher->using_evp = 1; } else { - AES_set_encrypt_key((const unsigned char *)key, key_bits,&cipher->key.aes); + AES_set_encrypt_key(key, key_bits,&cipher->key.aes); cipher->using_evp = 0; } @@ -348,6 +354,8 @@ evp_block128_fn(const uint8_t in[16], void aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) { + /* Note that the "128" below refers to the length of the counter, + * not the length of the AES key. */ if (cipher->using_evp) { /* In openssl 1.0.0, there's an if'd out EVP_aes_128_ctr in evp.h. If * it weren't disabled, it might be better just to use that. @@ -374,7 +382,7 @@ aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) /** Reset the 128-bit counter of cipher to the 16-bit big-endian value * in iv. */ static void -aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv) +aes_set_iv(aes_cnt_cipher_t *cipher, const uint8_t *iv) { #ifdef USING_COUNTER_VARS cipher->counter3 = ntohl(get_uint32(iv)); diff --git a/src/common/aes.h b/src/common/aes.h index 821fb74..1cda53f 100644 --- a/src/common/aes.h +++ b/src/common/aes.h @@ -15,7 +15,8 @@ typedef struct aes_cnt_cipher aes_cnt_cipher_t; -aes_cnt_cipher_t* aes_new_cipher(const char *key, const char *iv); +aes_cnt_cipher_t* aes_new_cipher(const uint8_t *key, const uint8_t *iv, + int key_bits); void aes_cipher_free(aes_cnt_cipher_t *cipher); void aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len); diff --git a/src/common/crypto.c b/src/common/crypto.c index bf682ff..7be43d7 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -69,6 +69,7 @@ ENABLE_GCC_WARNING(redundant-decls) #endif #include "torlog.h" +#include "torint.h" #include "aes.h" #include "util.h" #include "container.h" @@ -122,8 +123,8 @@ struct crypto_pk_t /** Key and stream information for a stream cipher. */ struct crypto_cipher_t { - char key[CIPHER_KEY_LEN]; /**< The raw key. */ - char iv[CIPHER_IV_LEN]; /**< The initial IV. */ + uint8_t key[CIPHER_KEY_LEN]; /**< The raw key. */ + uint8_t iv[CIPHER_IV_LEN]; /**< The initial IV. */ aes_cnt_cipher_t *cipher; /**< The key in format usable for counter-mode AES * encryption */ }; @@ -561,15 +562,15 @@ crypto_cipher_new_with_iv(const char *key, const char *iv) env = tor_malloc_zero(sizeof(crypto_cipher_t)); if (key == NULL) - crypto_rand(env->key, CIPHER_KEY_LEN); + crypto_rand((char*)env->key, CIPHER_KEY_LEN); else memcpy(env->key, key, CIPHER_KEY_LEN); if (iv == NULL) - crypto_rand(env->iv, CIPHER_IV_LEN); + crypto_rand((char*)env->iv, CIPHER_IV_LEN); else memcpy(env->iv, iv, CIPHER_IV_LEN); - env->cipher = aes_new_cipher(env->key, env->iv); + env->cipher = aes_new_cipher(env->key, env->iv, 128); return env; } @@ -1587,7 +1588,7 @@ crypto_pk_base64_decode(const char *str, size_t len) const char * crypto_cipher_get_key(crypto_cipher_t *env) { - return env->key; + return (const char *)env->key; } /** Encrypt fromlen bytes from from using the cipher

1 0