1 files changed, 6 insertions, 11 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c
index 028c709d28..e2e5730c7d 100644
--- a/src/lib/libcrypto/x509v3/v3_akey.c
+++ b/src/lib/libcrypto/x509v3/v3_akey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_akey.c,v 1.18 2016/12/30 15:54:49 jsing Exp $ */
+/* $OpenBSD: v3_akey.c,v 1.19 2017/01/29 17:49:23 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -145,8 +145,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                         if (cnf->value && !strcmp(cnf->value, "always"))
                                 issuer = 2;
                 } else {
-                        X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,
-                            X509V3_R_UNKNOWN_OPTION);
+                        X509V3error(X509V3_R_UNKNOWN_OPTION);
                         ERR_asprintf_error_data("name=%s", cnf->name);
                         return NULL;
                 }
@@ -155,8 +154,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
         if (!ctx || !ctx->issuer_cert) {
                 if (ctx && (ctx->flags == CTX_TEST))
                         return AUTHORITY_KEYID_new();
-                X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,
-                    X509V3_R_NO_ISSUER_CERTIFICATE);
+                X509V3error(X509V3_R_NO_ISSUER_CERTIFICATE);
                 return NULL;
         }
 
@@ -167,8 +165,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                 if ((i >= 0)  && (ext = X509_get_ext(cert, i)))
                         ikeyid = X509V3_EXT_d2i(ext);
                 if (keyid == 2 && !ikeyid) {
-                        X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,
-                            X509V3_R_UNABLE_TO_GET_ISSUER_KEYID);
+                        X509V3error(X509V3_R_UNABLE_TO_GET_ISSUER_KEYID);
                         return NULL;
                 }
         }
@@ -177,8 +174,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                 isname = X509_NAME_dup(X509_get_issuer_name(cert));
                 serial = ASN1_INTEGER_dup(X509_get_serialNumber(cert));
                 if (!isname || !serial) {
-                        X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,
-                            X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);
+                        X509V3error(X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);
                         goto err;
                 }
         }
@@ -190,8 +186,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                 if (!(gens = sk_GENERAL_NAME_new_null()) ||
                     !(gen = GENERAL_NAME_new()) ||
                     !sk_GENERAL_NAME_push(gens, gen)) {
-                        X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,
-                            ERR_R_MALLOC_FAILURE);
+                        X509V3error(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 gen->type = GEN_DIRNAME;