1 files changed, 8 insertions, 12 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_crld.c b/src/lib/libcrypto/x509v3/v3_crld.c
index b13bbc3501..f9f69fee14 100644
--- a/src/lib/libcrypto/x509v3/v3_crld.c
+++ b/src/lib/libcrypto/x509v3/v3_crld.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_crld.c,v 1.20 2016/12/30 15:54:49 jsing Exp $ */
+/* $OpenBSD: v3_crld.c,v 1.21 2017/01/29 17:49:23 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -115,8 +115,7 @@ STACK_OF(GENERAL_NAME) *gnames_from_sectname(X509V3_CTX *ctx, char *sect)
         else
                 gnsect = X509V3_parse_list(sect);
         if (!gnsect) {
-                X509V3err(X509V3_F_GNAMES_FROM_SECTNAME,
-                    X509V3_R_SECTION_NOT_FOUND);
+                X509V3error(X509V3_R_SECTION_NOT_FOUND);
                 return NULL;
         }
         gens = v2i_GENERAL_NAMES(NULL, ctx, gnsect);
@@ -146,8 +145,7 @@ set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx, CONF_VALUE *cnf)
                         return -1;
                 dnsect = X509V3_get_section(ctx, cnf->value);
                 if (!dnsect) {
-                        X509V3err(X509V3_F_SET_DIST_POINT_NAME,
-                            X509V3_R_SECTION_NOT_FOUND);
+                        X509V3error(X509V3_R_SECTION_NOT_FOUND);
                         X509_NAME_free(nm);
                         return -1;
                 }
@@ -163,16 +161,14 @@ set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx, CONF_VALUE *cnf)
                  */
                 if (sk_X509_NAME_ENTRY_value(rnm,
                     sk_X509_NAME_ENTRY_num(rnm) - 1)->set) {
-                        X509V3err(X509V3_F_SET_DIST_POINT_NAME,
-                            X509V3_R_INVALID_MULTIPLE_RDNS);
+                        X509V3error(X509V3_R_INVALID_MULTIPLE_RDNS);
                         goto err;
                 }
         } else
                 return 0;
 
         if (*pdp) {
-                X509V3err(X509V3_F_SET_DIST_POINT_NAME,
-                    X509V3_R_DISTPOINT_ALREADY_SET);
+                X509V3error(X509V3_R_DISTPOINT_ALREADY_SET);
                 goto err;
         }
 
@@ -361,7 +357,7 @@ v2i_crld(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
         return crld;
 
 merr:
-        X509V3err(X509V3_F_V2I_CRLD, ERR_R_MALLOC_FAILURE);
+        X509V3error(ERR_R_MALLOC_FAILURE);
 err:
         GENERAL_NAME_free(gen);
         GENERAL_NAMES_free(gens);
@@ -692,7 +688,7 @@ v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                         if (!set_reasons(&idp->onlysomereasons, val))
                                 goto err;
                 } else {
-                        X509V3err(X509V3_F_V2I_IDP, X509V3_R_INVALID_NAME);
+                        X509V3error(X509V3_R_INVALID_NAME);
                         X509V3_conf_err(cnf);
                         goto err;
                 }
@@ -700,7 +696,7 @@ v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
         return idp;
 
 merr:
-        X509V3err(X509V3_F_V2I_IDP, ERR_R_MALLOC_FAILURE);
+        X509V3error(ERR_R_MALLOC_FAILURE);
 err:
         ISSUING_DIST_POINT_free(idp);
         return NULL;