aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian-Ken Rueegsegger <rueegsegger@swiss-it.ch>2008-05-09 09:25:42 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2008-07-10 08:35:12 -0400
commitba6b0398721524ec817f74ea3492b48fa79de52f (patch)
tree88e2ec079c5223f1159afd4f077909e06badb25f
parenta558f1d4f8730f055b004b4c8ca1605aeb957daa (diff)
[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>
-rw-r--r--crypto/ripemd.h17
-rw-r--r--crypto/rmd128.c16
-rw-r--r--crypto/rmd160.c20
3 files changed, 35 insertions, 18 deletions
diff --git a/crypto/ripemd.h b/crypto/ripemd.h
index 2858e2266bd6..c57a2d4ce8d9 100644
--- a/crypto/ripemd.h
+++ b/crypto/ripemd.h
@@ -17,10 +17,27 @@
17#define RMD320_DIGEST_SIZE 40 17#define RMD320_DIGEST_SIZE 40
18#define RMD320_BLOCK_SIZE 64 18#define RMD320_BLOCK_SIZE 64
19 19
20/* initial values */
20#define RMD_H0 0x67452301UL 21#define RMD_H0 0x67452301UL
21#define RMD_H1 0xefcdab89UL 22#define RMD_H1 0xefcdab89UL
22#define RMD_H2 0x98badcfeUL 23#define RMD_H2 0x98badcfeUL
23#define RMD_H3 0x10325476UL 24#define RMD_H3 0x10325476UL
24#define RMD_H4 0xc3d2e1f0UL 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#endif 43#endif
diff --git a/crypto/rmd128.c b/crypto/rmd128.c
index 22cc13be4033..f72d2ce848d0 100644
--- a/crypto/rmd128.c
+++ b/crypto/rmd128.c
@@ -29,14 +29,14 @@ struct rmd128_ctx {
29 u32 buffer[16]; 29 u32 buffer[16];
30}; 30};
31 31
32#define K1 0x00000000UL 32#define K1 RMD_K1
33#define K2 0x5a827999UL 33#define K2 RMD_K2
34#define K3 0x6ed9eba1UL 34#define K3 RMD_K3
35#define K4 0x8f1bbcdcUL 35#define K4 RMD_K4
36#define KK1 0x50a28be6UL 36#define KK1 RMD_K6
37#define KK2 0x5c4dd124UL 37#define KK2 RMD_K7
38#define KK3 0x6d703ef3UL 38#define KK3 RMD_K8
39#define KK4 0x00000000UL 39#define KK4 RMD_K1
40 40
41#define F1(x, y, z) (x ^ y ^ z) /* XOR */ 41#define F1(x, y, z) (x ^ y ^ z) /* XOR */
42#define F2(x, y, z) (z ^ (x & (y ^ z))) /* x ? y : z */ 42#define F2(x, y, z) (z ^ (x & (y ^ z))) /* x ? y : z */
diff --git a/crypto/rmd160.c b/crypto/rmd160.c
index a8a9d3d7046b..80d647aada67 100644
--- a/crypto/rmd160.c
+++ b/crypto/rmd160.c
@@ -29,16 +29,16 @@ struct rmd160_ctx {
29 u32 buffer[16]; 29 u32 buffer[16];
30}; 30};
31 31
32#define K1 0x00000000UL 32#define K1 RMD_K1
33#define K2 0x5a827999UL 33#define K2 RMD_K2
34#define K3 0x6ed9eba1UL 34#define K3 RMD_K3
35#define K4 0x8f1bbcdcUL 35#define K4 RMD_K4
36#define K5 0xa953fd4eUL 36#define K5 RMD_K5
37#define KK1 0x50a28be6UL 37#define KK1 RMD_K6
38#define KK2 0x5c4dd124UL 38#define KK2 RMD_K7
39#define KK3 0x6d703ef3UL 39#define KK3 RMD_K8
40#define KK4 0x7a6d76e9UL 40#define KK4 RMD_K9
41#define KK5 0x00000000UL 41#define KK5 RMD_K1
42 42
43#define F1(x, y, z) (x ^ y ^ z) /* XOR */ 43#define F1(x, y, z) (x ^ y ^ z) /* XOR */
44#define F2(x, y, z) (z ^ (x & (y ^ z))) /* x ? y : z */ 44#define F2(x, y, z) (z ^ (x & (y ^ z))) /* x ? y : z */