From: Matt Caswell <matt@openssl.org>
Date: Thu, 18 Dec 2025 15:59:26 +0000 (+0000)
Subject: Remove dead EVP_enc_null() code
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c8280a13cbe3f74e9b403cd663ad48f38a40576;p=thirdparty%2Fopenssl.git

Remove dead EVP_enc_null() code

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

diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index 1303caa892d..2eb32ab6818 100644
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -13,16 +13,12 @@
 #include <openssl/objects.h>
 #include "crypto/evp.h"
 
-static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc);
-static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-    const unsigned char *in, size_t inl);
 static const EVP_CIPHER n_cipher = {
     NID_undef,
     1, 0, 0, 0,
     EVP_ORIG_GLOBAL,
-    null_init_key,
-    null_cipher,
+    NULL,
+    NULL,
     NULL,
     0,
     NULL,
@@ -35,17 +31,3 @@ const EVP_CIPHER *EVP_enc_null(void)
 {
     return &n_cipher;
 }
-
-static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc)
-{
-    return 1;
-}
-
-static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-    const unsigned char *in, size_t inl)
-{
-    if (in != out)
-        memcpy(out, in, inl);
-    return 1;
-}