Send the function codes from the error functions to the bit bucket,

as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_crpt.c b/src/lib/libcrypto/pkcs12/p12_crpt.c
index f2d635fc62..d1f7d71fd3 100644
--- a/src/lib/libcrypto/pkcs12/p12_crpt.c
+++ b/src/lib/libcrypto/pkcs12/p12_crpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_crpt.c,v 1.13 2016/11/08 20:01:06 miod Exp $ */
+/* $OpenBSD: p12_crpt.c,v 1.14 2017/01/29 17:49:23 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -82,20 +82,20 @@ PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
         /* Extract useful info from parameter */
         if (param == NULL || param->type != V_ASN1_SEQUENCE ||
             param->value.sequence == NULL) {
-                PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN, PKCS12_R_DECODE_ERROR);
+                PKCS12error(PKCS12_R_DECODE_ERROR);
                 return 0;
         }
 
         pbuf = param->value.sequence->data;
         if (!(pbe = d2i_PBEPARAM(NULL, &pbuf, param->value.sequence->length))) {
-                PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN, PKCS12_R_DECODE_ERROR);
+                PKCS12error(PKCS12_R_DECODE_ERROR);
                 return 0;
         }
 
         if (!pbe->iter)
                 iter = 1;
         else if ((iter = ASN1_INTEGER_get(pbe->iter)) <= 0) {
-                PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN, PKCS12_R_DECODE_ERROR);
+                PKCS12error(PKCS12_R_DECODE_ERROR);
                 PBEPARAM_free(pbe);
                 return 0;
         }
@@ -103,13 +103,13 @@ PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
         saltlen = pbe->salt->length;
         if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_KEY_ID,
             iter, EVP_CIPHER_key_length(cipher), key, md)) {
-                PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN, PKCS12_R_KEY_GEN_ERROR);
+                PKCS12error(PKCS12_R_KEY_GEN_ERROR);
                 PBEPARAM_free(pbe);
                 return 0;
         }
         if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_IV_ID,
             iter, EVP_CIPHER_iv_length(cipher), iv, md)) {
-                PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN, PKCS12_R_IV_GEN_ERROR);
+                PKCS12error(PKCS12_R_IV_GEN_ERROR);
                 PBEPARAM_free(pbe);
                 return 0;
         }