OpenSSL 0.9.7 stable 2002 05 08 merge

1 files changed, 9 insertions, 7 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c
index a4fd5b98ec..0d39ebde8c 100644
--- a/src/lib/libcrypto/pkcs12/p12_key.c
+++ b/src/lib/libcrypto/pkcs12/p12_key.c
@@ -118,6 +118,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
         }
 #endif
 
+        EVP_MD_CTX_init(&ctx);
 #ifdef  DEBUG_KEYGEN
         fprintf(stderr, "KEYGEN DEBUG\n");
         fprintf(stderr, "ID %d, ITER %d\n", id, iter);
@@ -147,14 +148,14 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
         for (i = 0; i < Slen; i++) *p++ = salt[i % saltlen];
         for (i = 0; i < Plen; i++) *p++ = pass[i % passlen];
         for (;;) {
-                EVP_DigestInit (&ctx, md_type);
-                EVP_DigestUpdate (&ctx, D, v);
-                EVP_DigestUpdate (&ctx, I, Ilen);
-                EVP_DigestFinal (&ctx, Ai, NULL);
+                EVP_DigestInit_ex(&ctx, md_type, NULL);
+                EVP_DigestUpdate(&ctx, D, v);
+                EVP_DigestUpdate(&ctx, I, Ilen);
+                EVP_DigestFinal_ex(&ctx, Ai, NULL);
                 for (j = 1; j < iter; j++) {
-                        EVP_DigestInit (&ctx, md_type);
-                        EVP_DigestUpdate (&ctx, Ai, u);
-                        EVP_DigestFinal (&ctx, Ai, NULL);
+                        EVP_DigestInit_ex(&ctx, md_type, NULL);
+                        EVP_DigestUpdate(&ctx, Ai, u);
+                        EVP_DigestFinal_ex(&ctx, Ai, NULL);
                 }
                 memcpy (out, Ai, min (n, u));
                 if (u >= n) {
@@ -164,6 +165,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
                         OPENSSL_free (I);
                         BN_free (Ij);
                         BN_free (Bpl1);
+                        EVP_MD_CTX_cleanup(&ctx);
 #ifdef DEBUG_KEYGEN
                         fprintf(stderr, "Output KEY (length %d)\n", tmpn);
                         h__dump(tmpout, tmpn);