1 files changed, 10 insertions, 17 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c
index ad4e0bc660..ca08ee55d5 100644
--- a/src/lib/libcrypto/pkcs12/p12_decr.c
+++ b/src/lib/libcrypto/pkcs12/p12_decr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_decr.c,v 1.17 2015/09/30 18:41:06 jsing Exp $ */
+/* $OpenBSD: p12_decr.c,v 1.18 2017/01/29 17:49:23 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -79,20 +79,19 @@ PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, int passlen,
         if (!EVP_PBE_CipherInit(algor->algorithm, pass, passlen,
             algor->parameter, &ctx, en_de)) {
                 out = NULL;
-                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,
-                    PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR);
+                PKCS12error(PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR);
                 goto err;
         }
 
         if (!(out = malloc(inlen + EVP_CIPHER_CTX_block_size(&ctx)))) {
-                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT, ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
         if (!EVP_CipherUpdate(&ctx, out, &i, in, inlen)) {
                 free(out);
                 out = NULL;
-                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT, ERR_R_EVP_LIB);
+                PKCS12error(ERR_R_EVP_LIB);
                 goto err;
         }
 
@@ -100,8 +99,7 @@ PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, int passlen,
         if (!EVP_CipherFinal_ex(&ctx, out + i, &i)) {
                 free(out);
                 out = NULL;
-                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,
-                    PKCS12_R_PKCS12_CIPHERFINAL_ERROR);
+                PKCS12error(PKCS12_R_PKCS12_CIPHERFINAL_ERROR);
                 goto err;
         }
         outlen += i;
@@ -131,8 +129,7 @@ PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it,
 
         if (!PKCS12_pbe_crypt(algor, pass, passlen, oct->data, oct->length,
             &out, &outlen, 0)) {
-                PKCS12err(PKCS12_F_PKCS12_ITEM_DECRYPT_D2I,
-                    PKCS12_R_PKCS12_PBE_CRYPT_ERROR);
+                PKCS12error(PKCS12_R_PKCS12_PBE_CRYPT_ERROR);
                 return NULL;
         }
         p = out;
@@ -140,8 +137,7 @@ PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it,
         if (zbuf)
                 explicit_bzero(out, outlen);
         if (!ret)
-                PKCS12err(PKCS12_F_PKCS12_ITEM_DECRYPT_D2I,
-                    PKCS12_R_DECODE_ERROR);
+                PKCS12error(PKCS12_R_DECODE_ERROR);
         free(out);
         return ret;
 }
@@ -160,20 +156,17 @@ PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it,
         int inlen;
 
         if (!(oct = ASN1_OCTET_STRING_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT,
-                    ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         inlen = ASN1_item_i2d(obj, &in, it);
         if (!in) {
-                PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT,
-                    PKCS12_R_ENCODE_ERROR);
+                PKCS12error(PKCS12_R_ENCODE_ERROR);
                 goto err;
         }
         if (!PKCS12_pbe_crypt(algor, pass, passlen, in, inlen, &oct->data,
             &oct->length, 1)) {
-                PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT,
-                    PKCS12_R_ENCRYPT_ERROR);
+                PKCS12error(PKCS12_R_ENCRYPT_ERROR);
                 goto err;
         }
         if (zbuf)