fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup!…

… fixup! fixup! DTLS 1.3 record number encryption
fwh-dc · Aug 29, 2024 · 18e7591 · 18e7591
1 parent 00ef41c
commit 18e7591
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/ssl/record/methods/dtls_meth.c b/ssl/record/methods/dtls_meth.c
@@ -381,25 +381,23 @@ int dtls_crypt_sequence_number(unsigned char *seq, size_t seq_len,
         iv = NULL;
         in = rec_data;
         inlen = 16;
-    } else if (OPENSSL_strncasecmp(name, "cha", 3) == 0) {
+    } else if (OPENSSL_strncasecmp(name, "chacha", 6) == 0) {
         iv = rec_data;
         in = rec_data + 4;
         inlen = 12;
     } else {
-        if (ossl_assert(OPENSSL_strncasecmp(name, "null", 4) == 0)) {
+        if (ossl_assert(OPENSSL_strncasecmp(name, "null", 4) == 0))
             return 1;
-        } else {
+        else
             return 0;
-        }
     }
 
     if (!ossl_assert(inlen >= 0)
             || (size_t)inlen > sizeof(mask)
             || seq_len > sizeof(mask)
             || EVP_CipherInit_ex(ctx, NULL, NULL, NULL, iv, 1) <= 0
-            || EVP_CipherUpdate(ctx, mask, &outlen, in, inlen) <= 0) {
+            || EVP_CipherUpdate(ctx, mask, &outlen, in, inlen) <= 0)
         return 0;
-    }
 
     for (i = 0; i < seq_len; i++)
         seq[i] ^= mask[i];

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
@@ -522,7 +522,7 @@ int ssl_cipher_get_evp_cipher_ecb(SSL_CTX *ctx, const SSL_CIPHER *sslc,
             if (ecb_name != NULL)
                 *enc = EVP_CIPHER_fetch(ctx->libctx, ecb_name, ctx->propq);
             else
-                return 0;
+                *enc = NULL;
         }
 
         if (*enc == NULL)