projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
37d398c
)
PEM: Fix i2b_PvK to use EVP_Encrypt calls consistently
author
Richard Levitte
<levitte@openssl.org>
Mon, 3 Aug 2020 19:09:26 +0000
(21:09 +0200)
committer
Richard Levitte
<levitte@openssl.org>
Fri, 7 Aug 2020 02:13:28 +0000
(
04:13
+0200)
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12574)
crypto/pem/pvkfmt.c
patch
|
blob
|
history
diff --git
a/crypto/pem/pvkfmt.c
b/crypto/pem/pvkfmt.c
index 3745a1c1e350d1ec47d5814edbd9ac67a6f0920b..95d1ff5a94d4cd5287daa289ec2f618f6ff2e097 100644
(file)
--- a/
crypto/pem/pvkfmt.c
+++ b/
crypto/pem/pvkfmt.c
@@
-859,9
+859,9
@@
static int i2b_PVK(unsigned char **out, const EVP_PKEY *pk, int enclevel,
if (!EVP_EncryptInit_ex(cctx, EVP_rc4(), NULL, keybuf, NULL))
goto error;
OPENSSL_cleanse(keybuf, 20);
- if (!EVP_
De
cryptUpdate(cctx, p, &enctmplen, p, pklen - 8))
+ if (!EVP_
En
cryptUpdate(cctx, p, &enctmplen, p, pklen - 8))
goto error;
- if (!EVP_
De
cryptFinal_ex(cctx, p + enctmplen, &enctmplen))
+ if (!EVP_
En
cryptFinal_ex(cctx, p + enctmplen, &enctmplen))
goto error;
}