From 2fa4b5bb53b3a4f51daaf2d59c612846d688dc18 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Fri, 27 Sep 2002 22:13:22 +0000
Subject: [PATCH] don't leak memory on pk ops

svn:r117
---
 src/common/crypto.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index abb3344d2c..bbf3657d0b 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -234,10 +234,9 @@ int crypto_pk_read_private_key_from_file(crypto_pk_env_t *env, FILE *src)
   
   switch(env->type) {
     case CRYPTO_PK_RSA:
-/*
     if (env->key)
-      RSA_free((RSA *)env->key);*/
-    env->key = (unsigned char *)PEM_read_RSAPrivateKey(src, (RSA **)&env->key, NULL, NULL);
+      RSA_free((RSA *)env->key);
+    env->key = (unsigned char *)PEM_read_RSAPrivateKey(src, NULL, NULL, NULL);
     if (!env->key)
       return -1;
     break;
@@ -298,7 +297,9 @@ int crypto_pk_read_public_key_from_file(crypto_pk_env_t *env, FILE *src)
   
   switch(env->type) {
     case CRYPTO_PK_RSA:
-    env->key = (unsigned char *)PEM_read_RSAPublicKey(src, (RSA **)&env->key, NULL, NULL);
+    if(env->key)
+      RSA_free((RSA *)env->key); 
+    env->key = (unsigned char *)PEM_read_RSAPublicKey(src, NULL, NULL, NULL);
     if (!env->key)
       return -1;
     break;