projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update dependencies.
[openssl.git]
/
crypto
/
pem
/
pem_pk8.c
diff --git
a/crypto/pem/pem_pk8.c
b/crypto/pem/pem_pk8.c
index f44182ffb5a264c29eb5ee57a3f1e15676623666..6deab8c33810f9cacf54a49546beddbaccfa76ff 100644
(file)
--- a/
crypto/pem/pem_pk8.c
+++ b/
crypto/pem/pem_pk8.c
@@
-118,7
+118,7
@@
static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER
char buf[PEM_BUFSIZE];
int ret;
if(!(p8inf = EVP_PKEY2PKCS8(x))) {
char buf[PEM_BUFSIZE];
int ret;
if(!(p8inf = EVP_PKEY2PKCS8(x))) {
- PEMerr(PEM_F_
PEM_WRITE_BIO_PKCS8PRIVATE
KEY,
+ PEMerr(PEM_F_
DO_PK8P
KEY,
PEM_R_ERROR_CONVERTING_PRIVATE_KEY);
return 0;
}
PEM_R_ERROR_CONVERTING_PRIVATE_KEY);
return 0;
}
@@
-127,8
+127,7
@@
static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER
if(!cb) klen = PEM_def_callback(buf, PEM_BUFSIZE, 1, u);
else klen = cb(buf, PEM_BUFSIZE, 1, u);
if(klen <= 0) {
if(!cb) klen = PEM_def_callback(buf, PEM_BUFSIZE, 1, u);
else klen = cb(buf, PEM_BUFSIZE, 1, u);
if(klen <= 0) {
- PEMerr(PEM_F_PEM_WRITE_BIO_PKCS8PRIVATEKEY,
- PEM_R_READ_KEY);
+ PEMerr(PEM_F_DO_PK8PKEY,PEM_R_READ_KEY);
PKCS8_PRIV_KEY_INFO_free(p8inf);
return 0;
}
PKCS8_PRIV_KEY_INFO_free(p8inf);
return 0;
}
@@
-136,7
+135,7
@@
static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER
kstr = buf;
}
p8 = PKCS8_encrypt(nid, enc, kstr, klen, NULL, 0, 0, p8inf);
kstr = buf;
}
p8 = PKCS8_encrypt(nid, enc, kstr, klen, NULL, 0, 0, p8inf);
- if(kstr == buf)
memset(buf, 0
, klen);
+ if(kstr == buf)
OPENSSL_cleanse(buf
, klen);
PKCS8_PRIV_KEY_INFO_free(p8inf);
if(isder) ret = i2d_PKCS8_bio(bp, p8);
else ret = PEM_write_bio_PKCS8(bp, p8);
PKCS8_PRIV_KEY_INFO_free(p8inf);
if(isder) ret = i2d_PKCS8_bio(bp, p8);
else ret = PEM_write_bio_PKCS8(bp, p8);
@@
-215,7
+214,7
@@
static int do_pk8pkey_fp(FILE *fp, EVP_PKEY *x, int isder, int nid, const EVP_CI
BIO *bp;
int ret;
if(!(bp = BIO_new_fp(fp, BIO_NOCLOSE))) {
BIO *bp;
int ret;
if(!(bp = BIO_new_fp(fp, BIO_NOCLOSE))) {
- PEMerr(PEM_F_
PEM_F_DO_PK8
KEY_FP,ERR_R_BUF_LIB);
+ PEMerr(PEM_F_
DO_PK8P
KEY_FP,ERR_R_BUF_LIB);
return(0);
}
ret = do_pk8pkey(bp, x, isder, nid, enc, kstr, klen, cb, u);
return(0);
}
ret = do_pk8pkey(bp, x, isder, nid, enc, kstr, klen, cb, u);