From: Niels Möller <nisse@lysator.liu.se>
Date: Mon, 28 Apr 2025 18:07:21 +0000 (+0200)
Subject: Delete old _DATA_SIZE aliases.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f6bd452738fcc1c87e251efd86c0d0c92589375;p=thirdparty%2Fnettle.git

Delete old _DATA_SIZE aliases.
---

diff --git a/ChangeLog b/ChangeLog
index 4380d8f5..5a660fab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-04-28  Niels Möller  <nisse@lysator.liu.se>
 
+	* ghosthash94.h, md*.h, ripemd160.h, sha*.h, umac.h: Delete all
+	_DATA_SIZE constant, they were backwards compatibility aliases for
+	_BLOCK_SIZE, from 2014 renaming.
+
 	* salsa20.h (salsa20_set_iv, SALSA20_IV_SIZE): Delete backwards
 	compatibility aliases.
 	* testsuite/salsa20-test.c: Update to consistently use "nonce"
diff --git a/gosthash94.h b/gosthash94.h
index 4231c528..b2db2645 100644
--- a/gosthash94.h
+++ b/gosthash94.h
@@ -77,8 +77,6 @@ extern "C" {
 
 #define GOSTHASH94_BLOCK_SIZE 32
 #define GOSTHASH94_DIGEST_SIZE 32
-/* For backwards compatibility */
-#define GOSTHASH94_DATA_SIZE GOSTHASH94_BLOCK_SIZE
 
 #define GOSTHASH94CP_BLOCK_SIZE GOSTHASH94_BLOCK_SIZE
 #define GOSTHASH94CP_DIGEST_SIZE GOSTHASH94_DIGEST_SIZE
diff --git a/md2.h b/md2.h
index 84d31a61..79176d91 100644
--- a/md2.h
+++ b/md2.h
@@ -47,8 +47,6 @@ extern "C" {
 
 #define MD2_DIGEST_SIZE 16
 #define MD2_BLOCK_SIZE 16
-/* For backwards compatibility */
-#define MD2_DATA_SIZE MD2_BLOCK_SIZE
 
 struct md2_ctx
 {
diff --git a/md4.h b/md4.h
index 131079d7..3aeb918b 100644
--- a/md4.h
+++ b/md4.h
@@ -47,8 +47,6 @@ extern "C" {
 
 #define MD4_DIGEST_SIZE 16
 #define MD4_BLOCK_SIZE 64
-/* For backwards compatibility */
-#define MD4_DATA_SIZE MD4_BLOCK_SIZE
 
 /* Digest is kept internally as 4 32-bit words. */
 #define _MD4_DIGEST_LENGTH 4
diff --git a/md5.h b/md5.h
index ab3e86d1..9df78c36 100644
--- a/md5.h
+++ b/md5.h
@@ -48,8 +48,6 @@ extern "C" {
 
 #define MD5_DIGEST_SIZE 16
 #define MD5_BLOCK_SIZE 64
-/* For backwards compatibility */
-#define MD5_DATA_SIZE MD5_BLOCK_SIZE
 
 /* Digest is kept internally as 4 32-bit words. */
 #define _MD5_DIGEST_LENGTH 4
@@ -79,9 +77,6 @@ md5_digest(struct md5_ctx *ctx,
 void
 md5_compress(uint32_t *state, const uint8_t *data);
 
-/* Old name, for backwards compatibility. */
-#define _nettle_md5_compress nettle_md5_compress
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/ripemd160.h b/ripemd160.h
index f54fb9db..af51f4fe 100644
--- a/ripemd160.h
+++ b/ripemd160.h
@@ -49,8 +49,6 @@ extern "C" {
 
 #define RIPEMD160_DIGEST_SIZE 20
 #define RIPEMD160_BLOCK_SIZE 64
-/* For backwards compatibility */
-#define RIPEMD160_DATA_SIZE RIPEMD160_BLOCK_SIZE
 
 /* Digest is kept internally as 5 32-bit words. */
 #define _RIPEMD160_DIGEST_LENGTH 5
diff --git a/sha1.h b/sha1.h
index d9ba79b0..0754b1e4 100644
--- a/sha1.h
+++ b/sha1.h
@@ -50,8 +50,6 @@ extern "C" {
 
 #define SHA1_DIGEST_SIZE 20
 #define SHA1_BLOCK_SIZE 64
-/* For backwards compatibility */
-#define SHA1_DATA_SIZE SHA1_BLOCK_SIZE
 
 /* Digest is kept internally as 5 32-bit words. */
 #define _SHA1_DIGEST_LENGTH 5
@@ -81,9 +79,6 @@ sha1_digest(struct sha1_ctx *ctx,
 void
 sha1_compress(uint32_t *state, const uint8_t *data);
 
-/* Old name, for backwards compatibility. */
-#define _nettle_sha1_compress nettle_sha1_compress
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/sha2.h b/sha2.h
index d5d8e5a4..25309be2 100644
--- a/sha2.h
+++ b/sha2.h
@@ -58,12 +58,6 @@ extern "C" {
 #define sha512_256_init   nettle_sha512_256_init
 #define sha512_256_digest nettle_sha512_256_digest
 
-/* For backwards compatibility */
-#define SHA224_DATA_SIZE SHA256_BLOCK_SIZE
-#define SHA256_DATA_SIZE SHA256_BLOCK_SIZE
-#define SHA512_DATA_SIZE SHA512_BLOCK_SIZE
-#define SHA384_DATA_SIZE SHA512_BLOCK_SIZE
-
 /* SHA256 */
 
 #define SHA256_DIGEST_SIZE 32
diff --git a/sha3.h b/sha3.h
index 95c13472..5cd9ee1a 100644
--- a/sha3.h
+++ b/sha3.h
@@ -98,12 +98,6 @@ sha3_permute (struct sha3_state *state);
 #define SHA3_512_DIGEST_SIZE 64
 #define SHA3_512_BLOCK_SIZE 72
 
-/* For backwards compatibility */
-#define SHA3_224_DATA_SIZE SHA3_224_BLOCK_SIZE
-#define SHA3_256_DATA_SIZE SHA3_256_BLOCK_SIZE
-#define SHA3_384_DATA_SIZE SHA3_384_BLOCK_SIZE
-#define SHA3_512_DATA_SIZE SHA3_512_BLOCK_SIZE
-
 struct sha3_128_ctx
 {
   struct sha3_state state;
diff --git a/umac.h b/umac.h
index c026c935..5efb4338 100644
--- a/umac.h
+++ b/umac.h
@@ -67,8 +67,6 @@ extern "C" {
 #define UMAC_BLOCK_SIZE 1024
 #define UMAC_MIN_NONCE_SIZE 1
 #define UMAC_MAX_NONCE_SIZE AES_BLOCK_SIZE
-/* For backwards compatibility */
-#define UMAC_DATA_SIZE UMAC_BLOCK_SIZE
 
 /* Subkeys and state for UMAC with tag size 32*n bits. */
 #define _UMAC_STATE(n)					\