diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-07 08:54:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-07 08:54:47 -0500 |
| commit | 6b37512dc76152926a16d93f2be52083cd5ae436 (patch) | |
| tree | 1030b477a53f6a520fb0138d7782df4ed0599b3d | |
| parent | 05ec055c417c80bf7b13914fade70a72f11accc5 (diff) | |
| parent | d6eae78e2928544ad634356887c7a83a2cd23eaa (diff) | |
| download | tor-6b37512dc76152926a16d93f2be52083cd5ae436.tar.gz tor-6b37512dc76152926a16d93f2be52083cd5ae436.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
| -rw-r--r-- | changes/rsa_init_bug | 7 | ||||
| -rw-r--r-- | src/common/crypto.c | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/changes/rsa_init_bug b/changes/rsa_init_bug new file mode 100644 index 0000000000..6b5fb4f2f9 --- /dev/null +++ b/changes/rsa_init_bug @@ -0,0 +1,7 @@ + o Major bugfixes (key management): + - If OpenSSL fails to generate an RSA key, do not retain a dangling pointer + to the previous (uninitialized) key value. The impact here should be + limited to a difficult-to-trigger crash, if OpenSSL is running an + engine that makes key generation failures possible, or if OpenSSL runs + out of memory. Fixes bug 19152; bugfix on 0.2.1.10-alpha. Found by + Yuan Jochen Kang, Suman Jana, and Baishakhi Ray. diff --git a/src/common/crypto.c b/src/common/crypto.c index 43bf5bd6b6..f7362765d2 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -557,8 +557,10 @@ crypto_pk_generate_key_with_bits(crypto_pk_t *env, int bits) { tor_assert(env); - if (env->key) + if (env->key) { RSA_free(env->key); + env->key = NULL; + } { BIGNUM *e = BN_new(); |