1 files changed, 4 insertions, 6 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_bitst.c b/src/lib/libcrypto/x509v3/v3_bitst.c
index e846fc2ffe..039faf2fd6 100644
--- a/src/lib/libcrypto/x509v3/v3_bitst.c
+++ b/src/lib/libcrypto/x509v3/v3_bitst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_bitst.c,v 1.13 2016/12/30 15:54:49 jsing Exp $ */
+/* $OpenBSD: v3_bitst.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.
  */
@@ -145,7 +145,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
         BIT_STRING_BITNAME *bnam;
 
         if (!(bs = ASN1_BIT_STRING_new())) {
-                X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, ERR_R_MALLOC_FAILURE);
+                X509V3error(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
@@ -155,8 +155,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                             !strcmp(bnam->lname, val->name) ) {
                                 if (!ASN1_BIT_STRING_set_bit(bs,
                                     bnam->bitnum, 1)) {
-                                        X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,
-                                            ERR_R_MALLOC_FAILURE);
+                                        X509V3error(ERR_R_MALLOC_FAILURE);
                                         ASN1_BIT_STRING_free(bs);
                                         return NULL;
                                 }
@@ -164,8 +163,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                         }
                 }
                 if (!bnam->lname) {
-                        X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,
-                            X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT);
+                        X509V3error(X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT);
                         X509V3_conf_err(val);
                         ASN1_BIT_STRING_free(bs);
                         return NULL;