udate enull_hmac* to null_hmac*

siemens · Jan 26, 2024 · 3921a49 · 3921a49
1 parent 11a8db9
commit 3921a49
Show file tree

Hide file tree

Showing 18 changed files with 192 additions and 192 deletions.
diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
@@ -321,10 +321,10 @@ int EVP_CIPHER_get_type(const EVP_CIPHER *cipher)
 
         return NID_des_cfb64;
 
-    case NID_enull_hmac_sha256:
-        return NID_enull_hmac_sha256;
-    case NID_enull_hmac_sha384:
-        return NID_enull_hmac_sha384;
+    case NID_null_hmac_sha256:
+        return NID_null_hmac_sha256;
+    case NID_null_hmac_sha384:
+        return NID_null_hmac_sha384;
 
     default:
 #ifdef FIPS_MODULE

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
@@ -2506,8 +2506,8 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"altSignatureAlgorithm", "X509v3 Alternative Signature Algorithm", NID_alt_signature_algorithm, 3, &so[8466]},
     {"altSignatureValue", "X509v3 Alternative Signature Value", NID_alt_signature_value, 3, &so[8469]},
     {"associatedInformation", "X509v3 Associated Information", NID_associated_information, 3, &so[8472]},
-    {"eNULL-HMAC-SHA256", "enull-hmac-sha256", NID_enull_hmac_sha256},
-    {"eNULL-HMAC-SHA384", "enull-hmac-sha384", NID_enull_hmac_sha384},
+    {"NULL-HMAC-SHA256", "null-hmac-sha256", NID_null_hmac_sha256},
+    {"NULL-HMAC-SHA384", "null-hmac-sha384", NID_null_hmac_sha384},
 };
 
 #define NUM_SN 1313
@@ -2705,6 +2705,8 @@ static const unsigned int sn_objs[NUM_SN] = {
      388,    /* "Mail" */
      393,    /* "NULL" */
      404,    /* "NULL" */
+    1320,    /* "NULL-HMAC-SHA256" */
+    1321,    /* "NULL-HMAC-SHA384" */
       57,    /* "Netscape" */
      366,    /* "Nonce" */
       17,    /* "O" */
@@ -2985,8 +2987,6 @@ static const unsigned int sn_objs[NUM_SN] = {
     1157,    /* "dstu34311" */
     1159,    /* "dstu4145be" */
     1158,    /* "dstu4145le" */
-    1320,    /* "eNULL-HMAC-SHA256" */
-    1321,    /* "eNULL-HMAC-SHA384" */
      791,    /* "ecdsa-with-Recommended" */
      416,    /* "ecdsa-with-SHA1" */
      793,    /* "ecdsa-with-SHA224" */
@@ -4370,8 +4370,6 @@ static const unsigned int ln_objs[NUM_LN] = {
       48,    /* "emailAddress" */
      632,    /* "encrypted track 2" */
      885,    /* "enhancedSearchGuide" */
-    1320,    /* "enull-hmac-sha256" */
-    1321,    /* "enull-hmac-sha384" */
     1267,    /* "ess-attributes" */
     1265,    /* "etsi" */
       56,    /* "extendedCertificateAttributes" */
@@ -4782,6 +4780,8 @@ static const unsigned int ln_objs[NUM_LN] = {
     1217,    /* "modp_8192" */
      481,    /* "nSRecord" */
      173,    /* "name" */
+    1320,    /* "null-hmac-sha256" */
+    1321,    /* "null-hmac-sha384" */
      681,    /* "onBasis" */
      379,    /* "org" */
     1089,    /* "organizationIdentifier" */

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
@@ -1317,5 +1317,5 @@ subject_alt_public_key_info		1316
 alt_signature_algorithm		1317
 alt_signature_value		1318
 associated_information		1319
-enull_hmac_sha256		1320
-enull_hmac_sha384		1321
+null_hmac_sha256		1320
+null_hmac_sha384		1321
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
@@ -1685,8 +1685,8 @@ sm-scheme 104 10        : SM4-XTS             : sm4-xts
 			: AES-256-CBC-HMAC-SHA256	: aes-256-cbc-hmac-sha256
 			: ChaCha20-Poly1305		: chacha20-poly1305
 			: ChaCha20			: chacha20
-			: eNULL-HMAC-SHA256		: enull-hmac-sha256
-			: eNULL-HMAC-SHA384		: enull-hmac-sha384
+			: NULL-HMAC-SHA256		: null-hmac-sha256
+			: NULL-HMAC-SHA384		: null-hmac-sha384
 
 ISO-US 10046 2 1	: dhpublicnumber		: X9.42 DH
 

diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
@@ -5290,13 +5290,13 @@
 #define LN_chacha20             "chacha20"
 #define NID_chacha20            1019
 
-#define SN_enull_hmac_sha256            "eNULL-HMAC-SHA256"
-#define LN_enull_hmac_sha256            "enull-hmac-sha256"
-#define NID_enull_hmac_sha256           1320
+#define SN_null_hmac_sha256             "NULL-HMAC-SHA256"
+#define LN_null_hmac_sha256             "null-hmac-sha256"
+#define NID_null_hmac_sha256            1320
 
-#define SN_enull_hmac_sha384            "eNULL-HMAC-SHA384"
-#define LN_enull_hmac_sha384            "enull-hmac-sha384"
-#define NID_enull_hmac_sha384           1321
+#define SN_null_hmac_sha384             "NULL-HMAC-SHA384"
+#define LN_null_hmac_sha384             "null-hmac-sha384"
+#define NID_null_hmac_sha384            1321
 
 #define SN_dhpublicnumber               "dhpublicnumber"
 #define LN_dhpublicnumber               "X9.42 DH"

diff --git a/providers/defltprov.c b/providers/defltprov.c
@@ -314,8 +314,8 @@ static const OSSL_ALGORITHM_CAPABLE deflt_ciphers[] = {
 # endif /* OPENSSL_NO_POLY1305 */
 #endif /* OPENSSL_NO_CHACHA */
 #ifndef OPENSSL_NO_TLS1_3_INTEGRITY_ONLY_CIPHERS
-    ALG(PROV_NAMES_ENULL_HMAC_SHA256, ossl_enull_hmac_sha256_functions),
-    ALG(PROV_NAMES_ENULL_HMAC_SHA384, ossl_enull_hmac_sha384_functions),
+    ALG(PROV_NAMES_NULL_HMAC_SHA256, ossl_null_hmac_sha256_functions),
+    ALG(PROV_NAMES_NULL_HMAC_SHA384, ossl_null_hmac_sha384_functions),
 #endif
     { { NULL, NULL, NULL }, NULL }
 };

diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info
@@ -26,7 +26,7 @@ $CHACHA_GOAL=../../libdefault.a
 $CHACHAPOLY_GOAL=../../libdefault.a
 $SIV_GOAL=../../libdefault.a
 $SIV_GCM_GOAL=../../libdefault.a
-$ENULL_HMAC_GOAL=../../libdefault.a
+$NULL_HMAC_GOAL=../../libdefault.a
 
 IF[{- !$disabled{asm} -}]
   $GHASHDEF_x86=GHASH_ASM
@@ -195,6 +195,6 @@ IF[{- !$disabled{chacha} -}]
 ENDIF
 
 IF[{- !$disabled{tls1_3-integrity-only_ciphers} -}]
-  SOURCE[$ENULL_HMAC_GOAL]=\
-      cipher_enull_hmac.c cipher_enull_hmac_hw.c
+  SOURCE[$NULL_HMAC_GOAL]=\
+      cipher_null_hmac.c cipher_null_hmac_hw.c
 ENDIF
diff --git a/providers/implementations/ciphers/cipher_enull_hmac.h b/providers/implementations/ciphers/cipher_enull_hmac.h