Revert "e_null_hmac.c, build.info, c_allc.c, evp.h: add dummy cipher …

…EVP_enc_null_hmac_sha256, for populating NID." This reverts commit cf30cbe.
siemens · Dec 4, 2023 · deab292 · deab292
1 parent a7dfa85
commit deab292
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 50 deletions.
diff --git a/crypto/evp/build.info b/crypto/evp/build.info
@@ -14,7 +14,7 @@ SOURCE[../../libcrypto]=$COMMON\
         c_allc.c c_alld.c bio_ok.c \
         evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c pbe_scrypt.c \
         e_aes_cbc_hmac_sha1.c e_aes_cbc_hmac_sha256.c e_rc4_hmac_md5.c \
-        e_chacha20_poly1305.c e_null_hmac.c \
+        e_chacha20_poly1305.c \
         legacy_sha.c ctrl_params_translate.c \
         cmeth_lib.c
 

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
@@ -265,8 +265,4 @@ void openssl_add_all_ciphers_int(void)
     EVP_add_cipher(EVP_chacha20_poly1305());
 # endif
 #endif
-
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHER
-    EVP_add_cipher(EVP_enc_null_hmac_sha256());
-#endif
 }
diff --git a/crypto/evp/e_null_hmac.c b/crypto/evp/e_null_hmac.c
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
@@ -1138,9 +1138,6 @@ const EVP_CIPHER *EVP_chacha20(void);
 const EVP_CIPHER *EVP_chacha20_poly1305(void);
 #  endif
 # endif
-# ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHER
-const EVP_CIPHER *EVP_enc_null_hmac_sha256(void);
-# endif
 
 # ifndef OPENSSL_NO_SEED
 const EVP_CIPHER *EVP_seed_ecb(void);