nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.8' into maint-0.2.9

Browse Source
This commit is contained in:
Nick Mathewson 2016-11-03 15:41:04 -04:00
commit 3bb49c0110
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug20553 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (memory leak):
- Work around a memory leak in OpenSSL 1.1 when encoding public keys.
Fixes bug 20553; bugfix on 0.0.2pre8.

5
src/common/crypto.c
View File

@ -743,14 +743,13 @@ crypto_pk_write_key_to_string_impl(crypto_pk_t *env, char **dest,
}
BIO_get_mem_ptr(b, &buf);
(void)BIO_set_close(b, BIO_NOCLOSE); /* so BIO_free doesn't free buf */
BIO_free(b);
*dest = tor_malloc(buf->length+1);
memcpy(*dest, buf->data, buf->length);
(*dest)[buf->length] = 0; /* nul terminate it */
*len = buf->length;
BUF_MEM_free(buf);
BIO_free(b);
return 0;
}

5
src/tools/tor-gencert.c
View File

@ -416,12 +416,11 @@ key_to_string(EVP_PKEY *key)
}
BIO_get_mem_ptr(b, &buf);
(void) BIO_set_close(b, BIO_NOCLOSE);
BIO_free(b);
result = tor_malloc(buf->length + 1);
memcpy(result, buf->data, buf->length);
result[buf->length] = 0;
BUF_MEM_free(buf);
BIO_free(b);
RSA_free(rsa);
return result;