From: Pauli <paul.dale@oracle.com>
Date: Wed, 22 Apr 2020 04:10:24 +0000 (+1000)
Subject: params: handle the modified sentinel.
X-Git-Tag: openssl-3.0.0-alpha2~163
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2baf2d81e3e1d7813452509b13c3439994322c91;p=oweals%2Fopenssl.git

params: handle the modified sentinel.

The param builder and the params from text helpers also need to be modified
aware.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11601)
---

diff --git a/crypto/param_build.c b/crypto/param_build.c
index 5927d01239..c4624ec33e 100644
--- a/crypto/param_build.c
+++ b/crypto/param_build.c
@@ -312,7 +312,7 @@ static OSSL_PARAM *param_bld_convert(OSSL_PARAM_BLD *bld, OSSL_PARAM *param,
         param[i].key = pd->key;
         param[i].data_type = pd->type;
         param[i].data_size = pd->size;
-        param[i].return_size = 0;
+        param[i].return_size = OSSL_PARAM_UNMODIFIED;
 
         if (pd->secure) {
             p = secure;
diff --git a/crypto/params_from_text.c b/crypto/params_from_text.c
index 25671c592c..14b64edb6b 100644
--- a/crypto/params_from_text.c
+++ b/crypto/params_from_text.c
@@ -157,7 +157,7 @@ static int construct_from_text(OSSL_PARAM *to, const OSSL_PARAM *paramdef,
     *to = *paramdef;
     to->data = buf;
     to->data_size = buf_n;
-    to->return_size = 0;
+    to->return_size = OSSL_PARAM_UNMODIFIED;
 
     return 1;
 }