1 files changed, 12 insertions, 15 deletions

diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
index 377b3b0a8b..b2c8ef6cfa 100644
--- a/src/lib/libcrypto/x509/by_file.c
+++ b/src/lib/libcrypto/x509/by_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_file.c,v 1.20 2016/03/11 07:08:45 mmcc Exp $ */
+/* $OpenBSD: by_file.c,v 1.21 2017/01/29 17:49:23 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -102,8 +102,7 @@ by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
                             X509_get_default_cert_file(),
                             X509_FILETYPE_PEM) != 0);
                         if (!ok) {
-                                X509err(X509_F_BY_FILE_CTRL,
-                                    X509_R_LOADING_DEFAULTS);
+                                X509error(X509_R_LOADING_DEFAULTS);
                         }
                 } else {
                         if (argl == X509_FILETYPE_PEM)
@@ -131,7 +130,7 @@ X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
         in = BIO_new(BIO_s_file_internal());
 
         if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
-                X509err(X509_F_X509_LOAD_CERT_FILE, ERR_R_SYS_LIB);
+                X509error(ERR_R_SYS_LIB);
                 goto err;
         }
 
@@ -144,8 +143,7 @@ X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
                                         ERR_clear_error();
                                         break;
                                 } else {
-                                        X509err(X509_F_X509_LOAD_CERT_FILE,
-                                            ERR_R_PEM_LIB);
+                                        X509error(ERR_R_PEM_LIB);
                                         goto err;
                                 }
                         }
@@ -160,7 +158,7 @@ X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
         } else if (type == X509_FILETYPE_ASN1) {
                 x = d2i_X509_bio(in, NULL);
                 if (x == NULL) {
-                        X509err(X509_F_X509_LOAD_CERT_FILE, ERR_R_ASN1_LIB);
+                        X509error(ERR_R_ASN1_LIB);
                         goto err;
                 }
                 i = X509_STORE_add_cert(ctx->store_ctx, x);
@@ -168,7 +166,7 @@ X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
                         goto err;
                 ret = i;
         } else {
-                X509err(X509_F_X509_LOAD_CERT_FILE, X509_R_BAD_X509_FILETYPE);
+                X509error(X509_R_BAD_X509_FILETYPE);
                 goto err;
         }
 err:
@@ -190,7 +188,7 @@ X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
         in = BIO_new(BIO_s_file_internal());
 
         if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
-                X509err(X509_F_X509_LOAD_CRL_FILE, ERR_R_SYS_LIB);
+                X509error(ERR_R_SYS_LIB);
                 goto err;
         }
 
@@ -203,8 +201,7 @@ X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
                                         ERR_clear_error();
                                         break;
                                 } else {
-                                        X509err(X509_F_X509_LOAD_CRL_FILE,
-                                            ERR_R_PEM_LIB);
+                                        X509error(ERR_R_PEM_LIB);
                                         goto err;
                                 }
                         }
@@ -219,7 +216,7 @@ X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
         } else if (type == X509_FILETYPE_ASN1) {
                 x = d2i_X509_CRL_bio(in, NULL);
                 if (x == NULL) {
-                        X509err(X509_F_X509_LOAD_CRL_FILE, ERR_R_ASN1_LIB);
+                        X509error(ERR_R_ASN1_LIB);
                         goto err;
                 }
                 i = X509_STORE_add_crl(ctx->store_ctx, x);
@@ -227,7 +224,7 @@ X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
                         goto err;
                 ret = i;
         } else {
-                X509err(X509_F_X509_LOAD_CRL_FILE, X509_R_BAD_X509_FILETYPE);
+                X509error(X509_R_BAD_X509_FILETYPE);
                 goto err;
         }
 err:
@@ -248,13 +245,13 @@ X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
                 return X509_load_cert_file(ctx, file, type);
         in = BIO_new_file(file, "r");
         if (!in) {
-                X509err(X509_F_X509_LOAD_CERT_CRL_FILE, ERR_R_SYS_LIB);
+                X509error(ERR_R_SYS_LIB);
                 return 0;
         }
         inf = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
         BIO_free(in);
         if (!inf) {
-                X509err(X509_F_X509_LOAD_CERT_CRL_FILE, ERR_R_PEM_LIB);
+                X509error(ERR_R_PEM_LIB);
                 return 0;
         }
         for (i = 0; i < sk_X509_INFO_num(inf); i++) {