Browse Source

Resolve openssl-only memory leaks

Nick Mathewson 5 years ago
parent
commit
d644c93ae9
3 changed files with 3 additions and 4 deletions
  1. 1 1
      src/lib/tls/tortls_openssl.c
  2. 1 2
      src/lib/tls/x509.c
  3. 1 1
      src/test/test_tortls_openssl.c

+ 1 - 1
src/lib/tls/tortls_openssl.c

@@ -609,7 +609,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime,
     if (result->my_id_cert) {
       X509_STORE *s = SSL_CTX_get_cert_store(result->ctx);
       tor_assert(s);
-      X509_STORE_add_cert(s, X509_dup(result->my_id_cert->cert));
+      X509_STORE_add_cert(s, result->my_id_cert->cert);
     }
   }
   SSL_CTX_set_session_cache_mode(result->ctx, SSL_SESS_CACHE_OFF);

+ 1 - 2
src/lib/tls/x509.c

@@ -128,9 +128,8 @@ tor_x509_cert_new,(tor_x509_cert_impl_t *x509_cert))
 
   return cert;
  err:
-  tor_free(cert);
   log_err(LD_CRYPTO, "Couldn't wrap encoded X509 certificate.");
-  tor_x509_cert_impl_free(x509_cert);
+  tor_x509_cert_free(cert);
   return NULL;
 }
 

+ 1 - 1
src/test/test_tortls_openssl.c

@@ -600,7 +600,7 @@ test_tortls_get_my_client_auth_key(void *ignored)
   tt_assert(ret == expected);
 
  done:
-  tor_free(expected);
+  crypto_pk_free(expected);
   tor_free(ctx);
 }