Merge branch 'maint-0.2.8' into maint-0.2.9

This commit is contained in:
Nick Mathewson
2016-11-03 15:41:04 -04:00
3 changed files with 7 additions and 6 deletions
+2 -3
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;