[CRYPTO] ripemd: Put all common RIPEMD values in header file

This patch puts all common RIPEMD values in the appropriate header file. Initial values and constants are the same for all variants of RIPEMD. Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

[CRYPTO] ripemd: Put all common RIPEMD values in header file
This patch puts all common RIPEMD values in the appropriate header file. Initial values and constants are the same for all variants of RIPEMD. Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Adrian-Ken Rueegsegger · Herbert Xu
1 parent a558f1d4f8
Showing 3 changed files with 35 additions and 18 deletions Side-by-side Diff
crypto/ripemd.h
crypto/rmd128.c
crypto/rmd160.c
@@ -17,11 +17,28 @@
 #define RMD320_DIGEST_SIZE      40
 #define RMD320_BLOCK_SIZE       64
  
+/* initial values  */
 #define RMD_H0  0x67452301UL
 #define RMD_H1  0xefcdab89UL
 #define RMD_H2  0x98badcfeUL
 #define RMD_H3  0x10325476UL
 #define RMD_H4  0xc3d2e1f0UL
+#define RMD_H5  0x76543210UL
+#define RMD_H6  0xfedcba98UL
+#define RMD_H7  0x89abcdefUL
+#define RMD_H8  0x01234567UL
+#define RMD_H9  0x3c2d1e0fUL
+
+/* constants */
+#define RMD_K1  0x00000000UL
+#define RMD_K2  0x5a827999UL
+#define RMD_K3  0x6ed9eba1UL
+#define RMD_K4  0x8f1bbcdcUL
+#define RMD_K5  0xa953fd4eUL
+#define RMD_K6  0x50a28be6UL
+#define RMD_K7  0x5c4dd124UL
+#define RMD_K8  0x6d703ef3UL
+#define RMD_K9  0x7a6d76e9UL
  
 #endif
@@ -29,14 +29,14 @@
 	u32 buffer[16];
 };
  
-#define K1  0x00000000UL
-#define K2  0x5a827999UL
-#define K3  0x6ed9eba1UL
-#define K4  0x8f1bbcdcUL
-#define KK1 0x50a28be6UL
-#define KK2 0x5c4dd124UL
-#define KK3 0x6d703ef3UL
-#define KK4 0x00000000UL
+#define K1  RMD_K1
+#define K2  RMD_K2
+#define K3  RMD_K3
+#define K4  RMD_K4
+#define KK1 RMD_K6
+#define KK2 RMD_K7
+#define KK3 RMD_K8
+#define KK4 RMD_K1
  
 #define F1(x, y, z) (x ^ y ^ z)		/* XOR */
 #define F2(x, y, z) (z ^ (x & (y ^ z)))	/* x ? y : z */
@@ -29,16 +29,16 @@
 	u32 buffer[16];
 };
  
-#define K1  0x00000000UL
-#define K2  0x5a827999UL
-#define K3  0x6ed9eba1UL
-#define K4  0x8f1bbcdcUL
-#define K5  0xa953fd4eUL
-#define KK1 0x50a28be6UL
-#define KK2 0x5c4dd124UL
-#define KK3 0x6d703ef3UL
-#define KK4 0x7a6d76e9UL
-#define KK5 0x00000000UL
+#define K1  RMD_K1
+#define K2  RMD_K2
+#define K3  RMD_K3
+#define K4  RMD_K4
+#define K5  RMD_K5
+#define KK1 RMD_K6
+#define KK2 RMD_K7
+#define KK3 RMD_K8
+#define KK4 RMD_K9
+#define KK5 RMD_K1
  
 #define F1(x, y, z) (x ^ y ^ z)		/* XOR */
 #define F2(x, y, z) (z ^ (x & (y ^ z)))	/* x ? y : z */
...	...	@@ -17,11 +17,28 @@
17	17	#define RMD320_DIGEST_SIZE 40
18	18	#define RMD320_BLOCK_SIZE 64
19	19
	20	+/* initial values */
20	21	#define RMD_H0 0x67452301UL
21	22	#define RMD_H1 0xefcdab89UL
22	23	#define RMD_H2 0x98badcfeUL
23	24	#define RMD_H3 0x10325476UL
24	25	#define RMD_H4 0xc3d2e1f0UL
	26	+#define RMD_H5 0x76543210UL
	27	+#define RMD_H6 0xfedcba98UL
	28	+#define RMD_H7 0x89abcdefUL
	29	+#define RMD_H8 0x01234567UL
	30	+#define RMD_H9 0x3c2d1e0fUL
	31	+
	32	+/* constants */
	33	+#define RMD_K1 0x00000000UL
	34	+#define RMD_K2 0x5a827999UL
	35	+#define RMD_K3 0x6ed9eba1UL
	36	+#define RMD_K4 0x8f1bbcdcUL
	37	+#define RMD_K5 0xa953fd4eUL
	38	+#define RMD_K6 0x50a28be6UL
	39	+#define RMD_K7 0x5c4dd124UL
	40	+#define RMD_K8 0x6d703ef3UL
	41	+#define RMD_K9 0x7a6d76e9UL
25	42
26	43	#endif
...	...	@@ -29,14 +29,14 @@
29	29	u32 buffer[16];
30	30	};
31	31
32		-#define K1 0x00000000UL
33		-#define K2 0x5a827999UL
34		-#define K3 0x6ed9eba1UL
35		-#define K4 0x8f1bbcdcUL
36		-#define KK1 0x50a28be6UL
37		-#define KK2 0x5c4dd124UL
38		-#define KK3 0x6d703ef3UL
39		-#define KK4 0x00000000UL
	32	+#define K1 RMD_K1
	33	+#define K2 RMD_K2
	34	+#define K3 RMD_K3
	35	+#define K4 RMD_K4
	36	+#define KK1 RMD_K6
	37	+#define KK2 RMD_K7
	38	+#define KK3 RMD_K8
	39	+#define KK4 RMD_K1
40	40
41	41	#define F1(x, y, z) (x ^ y ^ z) /* XOR */
42	42	#define F2(x, y, z) (z ^ (x & (y ^ z))) /* x ? y : z */
...	...	@@ -29,16 +29,16 @@
29	29	u32 buffer[16];
30	30	};
31	31
32		-#define K1 0x00000000UL
33		-#define K2 0x5a827999UL
34		-#define K3 0x6ed9eba1UL
35		-#define K4 0x8f1bbcdcUL
36		-#define K5 0xa953fd4eUL
37		-#define KK1 0x50a28be6UL
38		-#define KK2 0x5c4dd124UL
39		-#define KK3 0x6d703ef3UL
40		-#define KK4 0x7a6d76e9UL
41		-#define KK5 0x00000000UL
	32	+#define K1 RMD_K1
	33	+#define K2 RMD_K2
	34	+#define K3 RMD_K3
	35	+#define K4 RMD_K4
	36	+#define K5 RMD_K5
	37	+#define KK1 RMD_K6
	38	+#define KK2 RMD_K7
	39	+#define KK3 RMD_K8
	40	+#define KK4 RMD_K9
	41	+#define KK5 RMD_K1
42	42
43	43	#define F1(x, y, z) (x ^ y ^ z) /* XOR */
44	44	#define F2(x, y, z) (z ^ (x & (y ^ z))) /* x ? y : z */