1 files changed, 8 insertions, 15 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_info.c b/src/lib/libcrypto/x509v3/v3_info.c
index 34ffb1c539..27b5415b2a 100644
--- a/src/lib/libcrypto/x509v3/v3_info.c
+++ b/src/lib/libcrypto/x509v3/v3_info.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_info.c,v 1.24 2016/12/30 15:54:49 jsing Exp $ */
+/* $OpenBSD: v3_info.c,v 1.25 2017/01/29 17:49:23 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -221,8 +221,7 @@ i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method,
                 nlen = strlen(objtmp) + strlen(vtmp->name) + 5;
                 ntmp = malloc(nlen);
                 if (!ntmp) {
-                        X509V3err(X509V3_F_I2V_AUTHORITY_INFO_ACCESS,
-                            ERR_R_MALLOC_FAILURE);
+                        X509V3error(ERR_R_MALLOC_FAILURE);
                         return NULL;
                 }
                 strlcpy(ntmp, objtmp, nlen);
@@ -248,27 +247,23 @@ v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
         char *objtmp, *ptmp;
 
         if (!(ainfo = sk_ACCESS_DESCRIPTION_new_null())) {
-                X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,
-                    ERR_R_MALLOC_FAILURE);
+                X509V3error(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
                 cnf = sk_CONF_VALUE_value(nval, i);
                 if ((acc = ACCESS_DESCRIPTION_new()) == NULL) {
-                        X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,
-                            ERR_R_MALLOC_FAILURE);
+                        X509V3error(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 if (sk_ACCESS_DESCRIPTION_push(ainfo, acc) == 0) {
                         ACCESS_DESCRIPTION_free(acc);
-                        X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,
-                            ERR_R_MALLOC_FAILURE);
+                        X509V3error(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 ptmp = strchr(cnf->name, ';');
                 if (!ptmp) {
-                        X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,
-                            X509V3_R_INVALID_SYNTAX);
+                        X509V3error(X509V3_R_INVALID_SYNTAX);
                         goto err;
                 }
                 objlen = ptmp - cnf->name;
@@ -277,15 +272,13 @@ v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                 if (!v2i_GENERAL_NAME_ex(acc->location, method, ctx, &ctmp, 0))
                         goto err;
                 if (!(objtmp = malloc(objlen + 1))) {
-                        X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,
-                            ERR_R_MALLOC_FAILURE);
+                        X509V3error(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 strlcpy(objtmp, cnf->name, objlen + 1);
                 acc->method = OBJ_txt2obj(objtmp, 0);
                 if (!acc->method) {
-                        X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,
-                            X509V3_R_BAD_OBJECT);
+                        X509V3error(X509V3_R_BAD_OBJECT);
                         ERR_asprintf_error_data("value=%s", objtmp);
                         free(objtmp);
                         goto err;