projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
free null cleanup finale
[oweals/openssl.git]
/
crypto
/
evp
/
p_open.c
diff --git
a/crypto/evp/p_open.c
b/crypto/evp/p_open.c
index 229eb6417af87235138056e2d38957b035cbb3de..481c85518a6c5dd510b32cf646f127f7f57a6815 100644
(file)
--- a/
crypto/evp/p_open.c
+++ b/
crypto/evp/p_open.c
@@
-88,7
+88,7
@@
int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
}
size = RSA_size(priv->pkey.rsa);
}
size = RSA_size(priv->pkey.rsa);
- key =
(unsigned char *)
OPENSSL_malloc(size + 2);
+ key = OPENSSL_malloc(size + 2);
if (key == NULL) {
/* ERROR */
EVPerr(EVP_F_EVP_OPENINIT, ERR_R_MALLOC_FAILURE);
if (key == NULL) {
/* ERROR */
EVPerr(EVP_F_EVP_OPENINIT, ERR_R_MALLOC_FAILURE);
@@
-105,9
+105,7
@@
int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
ret = 1;
err:
ret = 1;
err:
- if (key != NULL)
- OPENSSL_cleanse(key, size);
- OPENSSL_free(key);
+ OPENSSL_clear_free(key, size);
return (ret);
}
return (ret);
}