1 files changed, 16 insertions, 24 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_add.c b/src/lib/libcrypto/pkcs12/p12_add.c
index 954ca03ebb..5642a141f5 100644
--- a/src/lib/libcrypto/pkcs12/p12_add.c
+++ b/src/lib/libcrypto/pkcs12/p12_add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_add.c,v 1.14 2016/12/30 15:34:35 jsing Exp $ */
+/* $OpenBSD: p12_add.c,v 1.15 2017/01/29 17:49:23 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -70,20 +70,17 @@ PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it, int nid1, int nid2)
         PKCS12_SAFEBAG *safebag;
 
         if (!(bag = PKCS12_BAGS_new())) {
-                PKCS12err(PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG,
-                    ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         bag->type = OBJ_nid2obj(nid1);
         if (!ASN1_item_pack(obj, it, &bag->value.octet)) {
-                PKCS12err(PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG,
-                    ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 PKCS12_BAGS_free(bag);
                 return NULL;
         }
         if (!(safebag = PKCS12_SAFEBAG_new())) {
-                PKCS12err(PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG,
-                    ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 PKCS12_BAGS_free(bag);
                 return NULL;
         }
@@ -100,7 +97,7 @@ PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8)
         PKCS12_SAFEBAG *bag;
 
         if (!(bag = PKCS12_SAFEBAG_new())) {
-                PKCS12err(PKCS12_F_PKCS12_MAKE_KEYBAG, ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         bag->type = OBJ_nid2obj(NID_keyBag);
@@ -119,7 +116,7 @@ PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass, int passlen,
 
         /* Set up the safe bag */
         if (!(bag = PKCS12_SAFEBAG_new())) {
-                PKCS12err(PKCS12_F_PKCS12_MAKE_SHKEYBAG, ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
 
@@ -132,7 +129,7 @@ PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass, int passlen,
 
         if (!(bag->value.shkeybag = PKCS8_encrypt(pbe_nid, pbe_ciph, pass,
             passlen, salt, saltlen, iter, p8))) {
-                PKCS12err(PKCS12_F_PKCS12_MAKE_SHKEYBAG, ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 PKCS12_SAFEBAG_free(bag);
                 return NULL;
         }
@@ -147,18 +144,17 @@ PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk)
         PKCS7 *p7;
 
         if (!(p7 = PKCS7_new())) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         p7->type = OBJ_nid2obj(NID_pkcs7_data);
         if (!(p7->d.data = ASN1_OCTET_STRING_new())) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
         if (!ASN1_item_pack(sk, &PKCS12_SAFEBAGS_it, &p7->d.data)) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA,
-                    PKCS12_R_CANT_PACK_STRUCTURE);
+                PKCS12error(PKCS12_R_CANT_PACK_STRUCTURE);
                 goto err;
         }
         return p7;
@@ -173,8 +169,7 @@ STACK_OF(PKCS12_SAFEBAG) *
 PKCS12_unpack_p7data(PKCS7 *p7)
 {
         if (!PKCS7_type_is_data(p7)) {
-                PKCS12err(PKCS12_F_PKCS12_UNPACK_P7DATA,
-                    PKCS12_R_CONTENT_TYPE_NOT_DATA);
+                PKCS12error(PKCS12_R_CONTENT_TYPE_NOT_DATA);
                 return NULL;
         }
         return ASN1_item_unpack(p7->d.data, &PKCS12_SAFEBAGS_it);
@@ -191,12 +186,11 @@ PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
         const EVP_CIPHER *pbe_ciph;
 
         if (!(p7 = PKCS7_new())) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         if (!PKCS7_set_type(p7, NID_pkcs7_encrypted)) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA,
-                    PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE);
+                PKCS12error(PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE);
                 goto err;
         }
 
@@ -208,7 +202,7 @@ PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
                 pbe = PKCS5_pbe_set(pbe_nid, iter, salt, saltlen);
 
         if (!pbe) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);
+                PKCS12error(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
         X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm);
@@ -216,8 +210,7 @@ PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
         ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data);
         if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_item_i2d_encrypt(
             pbe, &PKCS12_SAFEBAGS_it, pass, passlen, bags, 1))) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA,
-                    PKCS12_R_ENCRYPT_ERROR);
+                PKCS12error(PKCS12_R_ENCRYPT_ERROR);
                 goto err;
         }
 
@@ -257,8 +250,7 @@ STACK_OF(PKCS7) *
 PKCS12_unpack_authsafes(PKCS12 *p12)
 {
         if (!PKCS7_type_is_data(p12->authsafes)) {
-                PKCS12err(PKCS12_F_PKCS12_UNPACK_AUTHSAFES,
-                    PKCS12_R_CONTENT_TYPE_NOT_DATA);
+                PKCS12error(PKCS12_R_CONTENT_TYPE_NOT_DATA);
                 return NULL;
         }
         return ASN1_item_unpack(p12->authsafes->d.data,