params: update generated decoder based implementations to handle return code

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)

diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305.c.in b/providers/implementations/ciphers/cipher_chacha20_poly1305.c.in
index da4956aba1b09b0142f6d35adec99e882b8e18bf..b20fa33ddf86f5d1dd39a0a44aa047b1cd2e6fcc 100644 (file)
--- a/providers/implementations/ciphers/cipher_chacha20_poly1305.c.in
+++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.c.in
@@ -113,7 +113,8 @@ static int chacha20_poly1305_get_ctx_params(void *vctx, OSSL_PARAM params[])
     PROV_CHACHA20_POLY1305_CTX *ctx = (PROV_CHACHA20_POLY1305_CTX *)vctx;
     struct chacha20_poly1305_get_ctx_params_st p;
 
-    p = chacha20_poly1305_get_ctx_params_decoder(params);
+    if (ctx == NULL || !chacha20_poly1305_get_ctx_params_decoder(params, &p))
+        return 0;
 
     if (p.ivlen != NULL
             && !OSSL_PARAM_set_size_t(p.ivlen, CHACHA20_POLY1305_IVLEN)) {
@@ -187,10 +188,8 @@ static int chacha20_poly1305_set_ctx_params(void *vctx,
         (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->base.hw;
     struct chacha20_poly1305_set_ctx_params_st p;
 
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = chacha20_poly1305_set_ctx_params_decoder(params);
+    if (ctx == NULL || !chacha20_poly1305_set_ctx_params_decoder(params, &p))
+        return 0;
 
 
     if (p.keylen != NULL) {

diff --git a/providers/implementations/ciphers/ciphercommon.c.in b/providers/implementations/ciphers/ciphercommon.c.in
index 4b33caaf012e8579cac834cecd4a7c64c123f059..77412a841b6532ddbbd037c52d07780872532783 100644 (file)
--- a/providers/implementations/ciphers/ciphercommon.c.in
+++ b/providers/implementations/ciphers/ciphercommon.c.in
@@ -52,7 +52,8 @@ int ossl_cipher_generic_get_params(OSSL_PARAM params[], unsigned int md,
 {
     struct ossl_cipher_generic_get_params_st p;
 
-    p = ossl_cipher_generic_get_params_decoder(params);
+    if (!ossl_cipher_generic_get_params_decoder(params, &p))
+        return 0;
 
     if (p.mode != NULL && !OSSL_PARAM_set_uint(p.mode, md)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);
@@ -162,11 +163,9 @@ int ossl_cipher_var_keylen_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
     struct ossl_cipher_set_ctx_param_list_st p;
 
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = cipher_var_keylen_set_ctx_params_decoder(params);
-    if (!ossl_cipher_common_set_ctx_params(ctx, &p))
+    if (ctx == NULL
+            || !cipher_var_keylen_set_ctx_params_decoder(params, &p)
+            || !ossl_cipher_common_set_ctx_params(ctx, &p))
         return 0;
 
     if (p.keylen != NULL) {
@@ -649,7 +648,8 @@ int ossl_cipher_generic_get_ctx_params(void *vctx, OSSL_PARAM params[])
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
     struct ossl_cipher_get_ctx_param_list_st p;
 
-    p = cipher_generic_get_ctx_params_decoder(params);
+    if (ctx == NULL || !cipher_generic_get_ctx_params_decoder(params, &p))
+        return 0;
     return ossl_cipher_common_get_ctx_params(ctx, &p);
 }
 
@@ -710,7 +710,8 @@ int ossl_cipher_generic_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     if (ossl_param_is_empty(params))
         return 1;
 
-    p = cipher_generic_set_ctx_params_decoder(params);
+    if (ctx == NULL || !cipher_generic_set_ctx_params_decoder(params, &p))
+        return 0;
     return ossl_cipher_common_set_ctx_params(ctx, &p);
 }
 

diff --git a/providers/implementations/ciphers/ciphercommon_ccm.c.in b/providers/implementations/ciphers/ciphercommon_ccm.c.in
index 28de06389c8dd50c642eb74938c3b1b63612233a..9fd78c9eeff8060d44bc687bd6234b6b761634f7 100644 (file)
--- a/providers/implementations/ciphers/ciphercommon_ccm.c.in
+++ b/providers/implementations/ciphers/ciphercommon_ccm.c.in
@@ -89,10 +89,8 @@ int ossl_ccm_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     size_t sz, ivlen;
     struct ossl_cipher_ccm_set_ctx_params_st p;
 
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = ossl_cipher_ccm_set_ctx_params_decoder(params);
+    if (ctx == NULL || !ossl_cipher_ccm_set_ctx_params_decoder(params, &p))
+        return 0;
 
     if (p.tag != NULL) {
         if (p.tag->data_type != OSSL_PARAM_OCTET_STRING) {
@@ -179,7 +177,8 @@ int ossl_ccm_get_ctx_params(void *vctx, OSSL_PARAM params[])
     PROV_CCM_CTX *ctx = (PROV_CCM_CTX *)vctx;
     struct ossl_cipher_ccm_get_ctx_params_st p;
 
-    p = ossl_cipher_ccm_get_ctx_params_decoder(params);
+    if (ctx == NULL || !ossl_cipher_ccm_get_ctx_params_decoder(params, &p))
+        return 0;
 
     if (p.ivlen != NULL && !OSSL_PARAM_set_size_t(p.ivlen, ccm_get_ivlen(ctx))) {
         ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);

diff --git a/providers/implementations/ciphers/ciphercommon_gcm.c.in b/providers/implementations/ciphers/ciphercommon_gcm.c.in
index f55be80ce18475c8885c6c29fc54c48dc5371d0b..3d71a7d3b9e31f09317ef8f3912287d33afac59a 100644 (file)
--- a/providers/implementations/ciphers/ciphercommon_gcm.c.in
+++ b/providers/implementations/ciphers/ciphercommon_gcm.c.in
@@ -168,7 +168,8 @@ int ossl_gcm_get_ctx_params(void *vctx, OSSL_PARAM params[])
     size_t sz;
     struct ossl_cipher_gcm_get_ctx_params_st p;
 
-    p = ossl_cipher_gcm_get_ctx_params_decoder(params);
+    if (ctx == NULL || !ossl_cipher_gcm_get_ctx_params_decoder(params, &p))
+        return 0;
 
     if (p.ivlen != NULL && !OSSL_PARAM_set_size_t(p.ivlen, ctx->ivlen)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);
@@ -271,10 +272,8 @@ int ossl_gcm_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     void *vp;
     struct ossl_cipher_gcm_set_ctx_params_st p;
 
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = ossl_cipher_gcm_set_ctx_params_decoder(params);
+    if (ctx == NULL || !ossl_cipher_gcm_set_ctx_params_decoder(params, &p))
+        return 0;
 
     if (p.tag != NULL) {
         vp = ctx->buf;

diff --git a/providers/implementations/digests/digestcommon.c.in b/providers/implementations/digests/digestcommon.c.in
index 3c4e5f7e32e3214c67a990b2a3f7d3bb417f3af7..387c120d6f3193913ac1b3270b72898dfa110719 100644 (file)
--- a/providers/implementations/digests/digestcommon.c.in
+++ b/providers/implementations/digests/digestcommon.c.in
@@ -28,7 +28,8 @@ int ossl_digest_default_get_params(OSSL_PARAM params[], size_t blksz,
 {
     struct digest_default_get_params_st p;
 
-    p = digest_default_get_params_decoder(params);
+    if (!digest_default_get_params_decoder(params, &p))
+        return 0;
 
     if (p.bsize != NULL && !OSSL_PARAM_set_size_t(p.bsize, blksz)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);

diff --git a/providers/implementations/keymgmt/ml_dsa_kmgmt.c.in b/providers/implementations/keymgmt/ml_dsa_kmgmt.c.in
index 875abdbf38b8dd13d524991c5098bb92d719f363..d15b69fd6879c7dd5cef1528ee7903dbdf332513 100644 (file)
--- a/providers/implementations/keymgmt/ml_dsa_kmgmt.c.in
+++ b/providers/implementations/keymgmt/ml_dsa_kmgmt.c.in
@@ -203,7 +203,10 @@ static int ml_dsa_key_fromdata(ML_DSA_KEY *key, const OSSL_PARAM params[],
     const ML_DSA_PARAMS *key_params = ossl_ml_dsa_key_params(key);
     const uint8_t *pk = NULL, *sk = NULL, *seed = NULL;
     size_t pk_len = 0, sk_len = 0, seed_len = 0;
-    struct ml_dsa_key_type_params_st p = ml_dsa_key_type_params_decoder(params);
+    struct ml_dsa_key_type_params_st p;
+
+    if (key == NULL || !ml_dsa_key_type_params_decoder(params, &p))
+        return 0;
 
     if (p.pubkey != NULL) {
         if (!OSSL_PARAM_get_octet_string_ptr(p.pubkey, (const void **)&pk, &pk_len))
@@ -317,7 +320,10 @@ static int ml_dsa_get_params(void *keydata, OSSL_PARAM params[])
     ML_DSA_KEY *key = keydata;
     const uint8_t *d;
     size_t len;
-    struct ml_dsa_get_params_st p = ml_dsa_get_params_decoder(params);
+    struct ml_dsa_get_params_st p;
+
+    if (key == NULL || !ml_dsa_get_params_decoder(params, &p))
+        return 0;
 
     if (p.bits != NULL
             && !OSSL_PARAM_set_size_t(p.bits, 8 * ossl_ml_dsa_key_get_pub_len(key)))
@@ -512,12 +518,8 @@ static int ml_dsa_gen_set_params(void *genctx, const OSSL_PARAM params[])
     struct ml_dsa_gen_ctx *gctx = genctx;
     struct ml_dsa_gen_set_params_st p;
 
-    if (gctx == NULL)
+    if (gctx == NULL || !ml_dsa_gen_set_params_decoder(params, &p))
         return 0;
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = ml_dsa_gen_set_params_decoder(params);
 
     if (p.seed != NULL) {
         void *vp = gctx->entropy;

diff --git a/providers/implementations/keymgmt/ml_kem_kmgmt.c.in b/providers/implementations/keymgmt/ml_kem_kmgmt.c.in
index 8d68128406d4dee3d143d1bdd3e92220ff10ee6f..89c78636b584b036ff0ef4109ee9a2d745edd599 100644 (file)
--- a/providers/implementations/keymgmt/ml_kem_kmgmt.c.in
+++ b/providers/implementations/keymgmt/ml_kem_kmgmt.c.in
@@ -390,10 +390,11 @@ static int ml_kem_key_fromdata(ML_KEM_KEY *key,
     struct ml_kem_key_type_params_st p;
 
     /* Invalid attempt to mutate a key, what is the right error to report? */
-    if (key == NULL || ossl_ml_kem_have_pubkey(key))
+    if (key == NULL
+            || ossl_ml_kem_have_pubkey(key)
+            || !ml_kem_key_type_params_decoder(params, &p))
         return 0;
     v = ossl_ml_kem_key_vinfo(key);
-    p = ml_kem_key_type_params_decoder(params);
 
     /*
      * When a private key is provided, without a seed, any public key also
@@ -577,7 +578,10 @@ static int ml_kem_get_params(void *vkey, OSSL_PARAM params[])
 {
     ML_KEM_KEY *key = vkey;
     const ML_KEM_VINFO *v = ossl_ml_kem_key_vinfo(key);
-    struct ml_kem_get_params_st p = ml_kem_get_params_decoder(params);
+    struct ml_kem_get_params_st p;
+
+    if (key == NULL || !ml_kem_get_params_decoder(params, &p))
+        return 0;
 
     if (p.bits != NULL && !OSSL_PARAM_set_size_t(p.bits, v->bits))
         return 0;
@@ -667,10 +671,8 @@ static int ml_kem_set_params(void *vkey, const OSSL_PARAM params[])
     size_t publen = 0;
     struct ml_kem_set_params_st p;
 
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = ml_kem_set_params_decoder(params);
+    if (key == NULL || !ml_kem_set_params_decoder(params, &p))
+        return 0;
 
     /* Used in TLS via EVP_PKEY_set1_encoded_public_key(). */
     if (p.pub != NULL
@@ -704,12 +706,8 @@ static int ml_kem_gen_set_params(void *vgctx, const OSSL_PARAM params[])
     PROV_ML_KEM_GEN_CTX *gctx = vgctx;
     struct ml_kem_gen_set_params_st p;
 
-    if (gctx == NULL)
+    if (gctx == NULL || !ml_kem_gen_set_params_decoder(params, &p))
         return 0;
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = ml_kem_gen_set_params_decoder(params);
 
     if (p.propq != NULL) {
         if (p.propq->data_type != OSSL_PARAM_UTF8_STRING)

diff --git a/providers/implementations/keymgmt/mlx_kmgmt.c.in b/providers/implementations/keymgmt/mlx_kmgmt.c.in
index 9ea8eaf72398256bef5719c4ff6cdfa145994c8a..68998dd4ca873a40ed7abd1213577c7850fd52e7 100644 (file)
--- a/providers/implementations/keymgmt/mlx_kmgmt.c.in
+++ b/providers/implementations/keymgmt/mlx_kmgmt.c.in
@@ -171,14 +171,14 @@ static int export_sub_cb(const OSSL_PARAM *params, void *varg)
     struct ml_kem_import_export_st p;
     size_t len;
 
+    if (!ml_kem_import_export_decoder(params, &p))
+        return 0;
+
     /*
      * The caller will decide whether anything essential is missing, but, if
      * some key material was returned, it should have the right (parameter)
      * data type and length.
      */
-    if (ossl_param_is_empty(params))
-        return 1;
-    p = ml_kem_import_export_decoder(params);
     if (sub_arg->pubenc != NULL && p.pubkey != NULL) {
         void *pub = sub_arg->pubenc + sub_arg->puboff;
 
@@ -425,7 +425,8 @@ static int mlx_kem_key_fromdata(MLX_KEY *key,
     pubkey_bytes = key->minfo->pubkey_bytes + key->xinfo->pubkey_bytes;
     prvkey_bytes = key->minfo->prvkey_bytes + key->xinfo->prvkey_bytes;
 
-    p = ml_kem_import_export_decoder(params);
+    if (!ml_kem_import_export_decoder(params, &p))
+        return 0;
 
     /* What does the caller want to set? */
     if (p.pubkey != NULL &&
@@ -501,7 +502,8 @@ static int mlx_kem_get_params(void *vkey, OSSL_PARAM params[])
     size_t publen = key->minfo->pubkey_bytes + key->xinfo->pubkey_bytes;
     size_t prvlen = key->minfo->prvkey_bytes + key->xinfo->prvkey_bytes;
 
-    p = mlx_get_params_decoder(params);
+    if (key == NULL || !mlx_get_params_decoder(params, &p))
+        return 0;
 
     /* The reported "bit" count is those of the ML-KEM key */
     if (p.bits != NULL)
@@ -597,10 +599,8 @@ static int mlx_kem_set_params(void *vkey, const OSSL_PARAM params[])
     const void *pubenc = NULL;
     size_t publen = 0;
 
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = mlx_set_params_decoder(params);
+    if (key == NULL || !mlx_set_params_decoder(params, &p))
+        return 0;
 
     if (p.propq != NULL) {
         OPENSSL_free(key->propq);
@@ -640,12 +640,8 @@ static int mlx_kem_gen_set_params(void *vgctx, const OSSL_PARAM params[])
     PROV_ML_KEM_GEN_CTX *gctx = vgctx;
     struct mlx_gen_set_params_st p;
 
-    if (gctx == NULL)
+    if (gctx == NULL || !mlx_gen_set_params_decoder(params, &p))
         return 0;
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = mlx_gen_set_params_decoder(params);
 
     if (p.propq != NULL) {
         if (p.propq->data_type != OSSL_PARAM_UTF8_STRING)

diff --git a/providers/implementations/signature/eddsa_sig.c.in b/providers/implementations/signature/eddsa_sig.c.in
index ba40e3787e862d7569d8ceef93cdec9ac1c24c82..5e37351a41c16e1db68b082ce4b6fe1eb90ff515 100644 (file)
--- a/providers/implementations/signature/eddsa_sig.c.in
+++ b/providers/implementations/signature/eddsa_sig.c.in
@@ -801,11 +801,9 @@ static int eddsa_get_ctx_params(void *vpeddsactx, OSSL_PARAM *params)
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
     struct eddsa_get_ctx_params_st p;
 
-    if (peddsactx == NULL)
+    if (peddsactx == NULL || !eddsa_get_ctx_params_decoder(params, &p))
         return 0;
 
-    p = eddsa_get_ctx_params_decoder(params);
-
     if (p.id != NULL
         && !OSSL_PARAM_set_octet_string(p.id,
                                         peddsactx->aid_len == 0 ? NULL : peddsactx->aid_buf,
@@ -899,12 +897,8 @@ static int eddsa_set_ctx_params(void *vpeddsactx, const OSSL_PARAM params[])
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
     struct eddsa_set_ctx_params_st p;
 
-    if (peddsactx == NULL)
+    if (peddsactx == NULL || !eddsa_set_ctx_params_decoder(params, &p))
         return 0;
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = eddsa_set_ctx_params_decoder(params);
     return eddsa_set_ctx_params_internal(peddsactx, &p);
 }
 
@@ -926,12 +920,8 @@ static int eddsa_set_variant_ctx_params(void *vpeddsactx,
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
     struct eddsa_set_ctx_params_st p;
 
-    if (peddsactx == NULL)
+    if (peddsactx == NULL || !eddsa_set_variant_ctx_params_decoder(params, &p))
         return 0;
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = eddsa_set_variant_ctx_params_decoder(params);
     return eddsa_set_ctx_params_internal(peddsactx, &p);
 }
 

diff --git a/providers/implementations/signature/ml_dsa_sig.c.in b/providers/implementations/signature/ml_dsa_sig.c.in
index 28d01f0cdd55b23edb2e0839e9f76a066f98619c..6717fcfdd4168a1760d7e53f007aa8cc9dcecc76 100644 (file)
--- a/providers/implementations/signature/ml_dsa_sig.c.in
+++ b/providers/implementations/signature/ml_dsa_sig.c.in
@@ -390,12 +390,8 @@ static int ml_dsa_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     PROV_ML_DSA_CTX *pctx = (PROV_ML_DSA_CTX *)vctx;
     struct ml_dsa_verifymsg_set_ctx_params_st p;
 
-    if (pctx == NULL)
+    if (pctx == NULL || !ml_dsa_verifymsg_set_ctx_params_decoder(params, &p))
         return 0;
-    if (ossl_param_is_empty(params))
-        return 1;
-
-    p = ml_dsa_verifymsg_set_ctx_params_decoder(params);
 
     if (p.ctx != NULL) {
         void *vp = pctx->context_string;
@@ -468,11 +464,9 @@ static int ml_dsa_get_ctx_params(void *vctx, OSSL_PARAM *params)
     PROV_ML_DSA_CTX *ctx = (PROV_ML_DSA_CTX *)vctx;
     struct ml_dsa_get_ctx_params_st p;
 
-    if (ctx == NULL)
+    if (ctx == NULL || !ml_dsa_get_ctx_params_decoder(params, &p))
         return 0;
 
-    p = ml_dsa_get_ctx_params_decoder(params);
-
     if (p.id != NULL
         && !OSSL_PARAM_set_octet_string(p.id,
                                         ctx->aid_len == 0 ? NULL : ctx->aid_buf,