From: Shane Lontis <shane.lontis@oracle.com>
Date: Sat, 22 May 2021 02:38:19 +0000 (+1000)
Subject: Add missing EVP_CTRL_CCM_SET_L control
X-Git-Tag: openssl-3.0.0-beta1~329
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5d0c02cdcb49d31f07d82e36a113c118f4775ec;p=thirdparty%2Fopenssl.git

Add missing EVP_CTRL_CCM_SET_L control

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15416)
---

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 143ae1b076a..dc22d507a4c 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -1073,6 +1073,12 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
             return 0;
         params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_IVLEN, &sz);
         break;
+    case EVP_CTRL_CCM_SET_L:
+        if (arg < 2 || arg > 8)
+            return 0;
+        sz = 15 - arg;
+        params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_IVLEN, &sz);
+        break;
     case EVP_CTRL_AEAD_SET_IV_FIXED:
         params[0] = OSSL_PARAM_construct_octet_string(
                         OSSL_CIPHER_PARAM_AEAD_TLS1_IV_FIXED, ptr, sz);