Make EVPs allocate context memory, thus making them extensible. Rationalise

DES's keyschedules.

I know these two should be separate, and I'll back out the DES changes if they
are deemed to be an error.

Note that there is a memory leak lurking in SSL somewhere in this version.

1 files changed, 8 insertions, 8 deletions

diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c
index c6abb87201..ab1d8d1166 100644
--- a/crypto/des/str2key.c
+++ b/crypto/des/str2key.c
@@ -86,9 +86,9 @@ void des_string_to_key(const char *str, des_cblock *key)
 		}
 #endif
 	des_set_odd_parity(key);
-	des_set_key_unchecked(key,ks);
-	des_cbc_cksum((const unsigned char*)str,key,length,ks,key);
-	memset(ks,0,sizeof(ks));
+	des_set_key_unchecked(key,&ks);
+	des_cbc_cksum((const unsigned char*)str,key,length,&ks,key);
+	memset(&ks,0,sizeof(ks));
 	des_set_odd_parity(key);
 	}
 
@@ -145,11 +145,11 @@ void des_string_to_2keys(const char *str, des_cblock *key1, des_cblock *key2)
 #endif
 	des_set_odd_parity(key1);
 	des_set_odd_parity(key2);
-	des_set_key_unchecked(key1,ks);
-	des_cbc_cksum((const unsigned char*)str,key1,length,ks,key1);
-	des_set_key_unchecked(key2,ks);
-	des_cbc_cksum((const unsigned char*)str,key2,length,ks,key2);
-	memset(ks,0,sizeof(ks));
+	des_set_key_unchecked(key1,&ks);
+	des_cbc_cksum((const unsigned char*)str,key1,length,&ks,key1);
+	des_set_key_unchecked(key2,&ks);
+	des_cbc_cksum((const unsigned char*)str,key2,length,&ks,key2);
+	memset(&ks,0,sizeof(ks));
 	des_set_odd_parity(key1);
 	des_set_odd_parity(key2);
 	}