[or-cvs] don"t leak memory on pk ops

[Roger Dingledine]

Update of /home/or/cvsroot/src/common
In directory moria.seul.org:/home/arma/work/onion/cvs/src/common

Modified Files:
	crypto.c 
Log Message:
don't leak memory on pk ops


Index: crypto.c
===================================================================
RCS file: /home/or/cvsroot/src/common/crypto.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- crypto.c	24 Sep 2002 10:43:54 -0000	1.7
+++ crypto.c	27 Sep 2002 22:13:22 -0000	1.8
@@ -234,10 +234,9 @@
   
   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 @@
   
   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;