projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
evp: convert existing code to use the new modified sentinel for params.
[openssl.git]
/
crypto
/
evp
/
evp_lib.c
diff --git
a/crypto/evp/evp_lib.c
b/crypto/evp/evp_lib.c
index d2890d3a2682c0b9903c84db098c7eca46af4441..d5f758fb4f0c772f18651842bd42c6745f46e5e7 100644
(file)
--- a/
crypto/evp/evp_lib.c
+++ b/
crypto/evp/evp_lib.c
@@
-76,13
+76,15
@@
int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
goto err;
/* ... but, we should get a return size too! */
goto err;
/* ... but, we should get a return size too! */
- if (params[0].return_size != 0
+ if (OSSL_PARAM_modified(params)
+ && params[0].return_size != 0
&& (der = OPENSSL_malloc(params[0].return_size)) != NULL) {
params[0].data = der;
params[0].data_size = params[0].return_size;
&& (der = OPENSSL_malloc(params[0].return_size)) != NULL) {
params[0].data = der;
params[0].data_size = params[0].return_size;
-
params[0].return_size = 0
;
+
OSSL_PARAM_set_all_unmodified(params)
;
derp = der;
if (EVP_CIPHER_CTX_get_params(c, params)
derp = der;
if (EVP_CIPHER_CTX_get_params(c, params)
+ && OSSL_PARAM_modified(params)
&& d2i_ASN1_TYPE(&type, (const unsigned char **)&derp,
params[0].return_size) != NULL) {
ret = 1;
&& d2i_ASN1_TYPE(&type, (const unsigned char **)&derp,
params[0].return_size) != NULL) {
ret = 1;