Fix AES code.

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

diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index f1094b3840edcbc90dbac6daf615bfd950416f68..13d866da51290fca62cba9fef55e187b795e61ff 100644 (file)
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -106,10 +106,7 @@ int PKCS12_verify_mac (PKCS12 *p12, const char *pass, int passlen)
                return 0;
        }
        if ((maclen != (unsigned int)p12->mac->dinfo->digest->length)
-       || memcmp (mac, p12->mac->dinfo->digest->data, maclen)) {
-               PKCS12err(PKCS12_F_VERIFY_MAC,PKCS12_R_MAC_VERIFY_ERROR);
-               return 0;
-       }
+       || memcmp (mac, p12->mac->dinfo->digest->data, maclen)) return 0;
        return 1;
 }
 
@@ -152,12 +149,12 @@ int PKCS12_setup_mac (PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
        }
        if (!saltlen) saltlen = PKCS12_SALT_LEN;
        p12->mac->salt->length = saltlen;
-       if (!(p12->mac->salt->data = Malloc (saltlen))) {
+       if (!(p12->mac->salt->data = OPENSSL_malloc (saltlen))) {
                PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
                return 0;
        }
        if (!salt) {
-               if (RAND_bytes (p12->mac->salt->data, saltlen) <= 0)
+               if (RAND_pseudo_bytes (p12->mac->salt->data, saltlen) < 0)
                        return 0;
        }
        else memcpy (p12->mac->salt->data, salt, saltlen);