summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pem/pem_pk8.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pem/pem_pk8.c')
-rw-r--r--src/lib/libcrypto/pem/pem_pk8.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pem/pem_pk8.c b/src/lib/libcrypto/pem/pem_pk8.c
index db38a2a79d..6deab8c338 100644
--- a/src/lib/libcrypto/pem/pem_pk8.c
+++ b/src/lib/libcrypto/pem/pem_pk8.c
@@ -118,7 +118,7 @@ static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER
118 char buf[PEM_BUFSIZE]; 118 char buf[PEM_BUFSIZE];
119 int ret; 119 int ret;
120 if(!(p8inf = EVP_PKEY2PKCS8(x))) { 120 if(!(p8inf = EVP_PKEY2PKCS8(x))) {
121 PEMerr(PEM_F_PEM_WRITE_BIO_PKCS8PRIVATEKEY, 121 PEMerr(PEM_F_DO_PK8PKEY,
122 PEM_R_ERROR_CONVERTING_PRIVATE_KEY); 122 PEM_R_ERROR_CONVERTING_PRIVATE_KEY);
123 return 0; 123 return 0;
124 } 124 }
@@ -127,8 +127,7 @@ static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER
127 if(!cb) klen = PEM_def_callback(buf, PEM_BUFSIZE, 1, u); 127 if(!cb) klen = PEM_def_callback(buf, PEM_BUFSIZE, 1, u);
128 else klen = cb(buf, PEM_BUFSIZE, 1, u); 128 else klen = cb(buf, PEM_BUFSIZE, 1, u);
129 if(klen <= 0) { 129 if(klen <= 0) {
130 PEMerr(PEM_F_PEM_WRITE_BIO_PKCS8PRIVATEKEY, 130 PEMerr(PEM_F_DO_PK8PKEY,PEM_R_READ_KEY);
131 PEM_R_READ_KEY);
132 PKCS8_PRIV_KEY_INFO_free(p8inf); 131 PKCS8_PRIV_KEY_INFO_free(p8inf);
133 return 0; 132 return 0;
134 } 133 }
@@ -215,7 +214,7 @@ static int do_pk8pkey_fp(FILE *fp, EVP_PKEY *x, int isder, int nid, const EVP_CI
215 BIO *bp; 214 BIO *bp;
216 int ret; 215 int ret;
217 if(!(bp = BIO_new_fp(fp, BIO_NOCLOSE))) { 216 if(!(bp = BIO_new_fp(fp, BIO_NOCLOSE))) {
218 PEMerr(PEM_F_PEM_F_DO_PK8KEY_FP,ERR_R_BUF_LIB); 217 PEMerr(PEM_F_DO_PK8PKEY_FP,ERR_R_BUF_LIB);
219 return(0); 218 return(0);
220 } 219 }
221 ret = do_pk8pkey(bp, x, isder, nid, enc, kstr, klen, cb, u); 220 ret = do_pk8pkey(bp, x, isder, nid, enc, kstr, klen, cb, u);