Use bg instead of bag as argument to macros, to avoid clashes with

[openssl.git] / crypto / pkcs12 / p12_key.c

diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index a9b4b8c9721e68a866abdc38168d399ebfff9554..0d39ebde8c8ec67da8a47beb9bee9a805c5dfcd6 100644 (file)
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -102,7 +102,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
             const EVP_MD *md_type)
 {
        unsigned char *B, *D, *I, *p, *Ai;
-       int Slen, Plen, Ilen;
+       int Slen, Plen, Ilen, Ijlen;
        int i, j, u, v;
        BIGNUM *Ij, *Bpl1;      /* These hold Ij and B + 1 */
        EVP_MD_CTX ctx;
@@ -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);
@@ -180,10 +182,17 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
                        BN_bin2bn (I + j, v, Ij);
                        BN_add (Ij, Ij, Bpl1);
                        BN_bn2bin (Ij, B);
+                       Ijlen = BN_num_bytes (Ij);
                        /* If more than 2^(v*8) - 1 cut off MSB */
-                       if (BN_num_bytes (Ij) > v) {
+                       if (Ijlen > v) {
                                BN_bn2bin (Ij, B);
                                memcpy (I + j, B + 1, v);
+#ifndef PKCS12_BROKEN_KEYGEN
+                       /* If less than v bytes pad with zeroes */
+                       } else if (Ijlen < v) {
+                               memset(I + j, 0, v - Ijlen);
+                               BN_bn2bin(Ij, I + j + v - Ijlen); 
+#endif
                        } else BN_bn2bin (Ij, I + j);
                }
        }