1 files changed, 6 insertions, 7 deletions

diff --git a/src/lib/libcrypto/pem/pem_pk8.c b/src/lib/libcrypto/pem/pem_pk8.c
index 4b3578f971..43581905f0 100644
--- a/src/lib/libcrypto/pem/pem_pk8.c
+++ b/src/lib/libcrypto/pem/pem_pk8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_pk8.c,v 1.12 2016/09/04 16:10:38 jsing Exp $ */
+/* $OpenBSD: pem_pk8.c,v 1.13 2017/01/29 17:49:23 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -116,8 +116,7 @@ do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc,
         int ret;
 
         if (!(p8inf = EVP_PKEY2PKCS8(x))) {
-                PEMerr(PEM_F_DO_PK8PKEY,
-                    PEM_R_ERROR_CONVERTING_PRIVATE_KEY);
+                PEMerror(PEM_R_ERROR_CONVERTING_PRIVATE_KEY);
                 return 0;
         }
         if (enc || (nid != -1)) {
@@ -127,7 +126,7 @@ do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc,
                         else
                                 klen = cb(buf, PEM_BUFSIZE, 1, u);
                         if (klen <= 0) {
-                                PEMerr(PEM_F_DO_PK8PKEY, PEM_R_READ_KEY);
+                                PEMerror(PEM_R_READ_KEY);
                                 PKCS8_PRIV_KEY_INFO_free(p8inf);
                                 return 0;
                         }
@@ -171,7 +170,7 @@ d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
         else
                 klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u);
         if (klen <= 0) {
-                PEMerr(PEM_F_D2I_PKCS8PRIVATEKEY_BIO, PEM_R_BAD_PASSWORD_READ);
+                PEMerror(PEM_R_BAD_PASSWORD_READ);
                 X509_SIG_free(p8);
                 return NULL;
         }
@@ -227,7 +226,7 @@ do_pk8pkey_fp(FILE *fp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc,
         int ret;
 
         if (!(bp = BIO_new_fp(fp, BIO_NOCLOSE))) {
-                PEMerr(PEM_F_DO_PK8PKEY_FP, ERR_R_BUF_LIB);
+                PEMerror(ERR_R_BUF_LIB);
                 return (0);
         }
         ret = do_pk8pkey(bp, x, isder, nid, enc, kstr, klen, cb, u);
@@ -242,7 +241,7 @@ d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
         EVP_PKEY *ret;
 
         if (!(bp = BIO_new_fp(fp, BIO_NOCLOSE))) {
-                PEMerr(PEM_F_D2I_PKCS8PRIVATEKEY_FP, ERR_R_BUF_LIB);
+                PEMerror(ERR_R_BUF_LIB);
                 return NULL;
         }
         ret = d2i_PKCS8PrivateKey_bio(bp, x, cb, u);