Commit 3bb49c01 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.2.8' into maint-0.2.9

parents ff3e08f2 9b18b215

changes/bug20553

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/common/crypto.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

}

src/tools/tor-gencert.c

+2 −3
Original line number Diff line number Diff line
@@ -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;