aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/whrlpool
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-02-22 14:43:31 +0100
committermarha <marha@users.sourceforge.net>2015-02-22 14:43:31 +0100
commitc9aad1ae6227c434d480d1d3aa8eae3c3c910c18 (patch)
tree94b917df998c3d547e191b3b9c58bbffc616470e /openssl/crypto/whrlpool
parentf1c2db43dcf35d2cf4715390bd2391c28e42a8c2 (diff)
downloadvcxsrv-c9aad1ae6227c434d480d1d3aa8eae3c3c910c18.tar.gz
vcxsrv-c9aad1ae6227c434d480d1d3aa8eae3c3c910c18.tar.bz2
vcxsrv-c9aad1ae6227c434d480d1d3aa8eae3c3c910c18.zip
Upgraded to openssl-1.0.2
Diffstat (limited to 'openssl/crypto/whrlpool')
-rw-r--r--openssl/crypto/whrlpool/asm/wp-mmx.pl42
-rw-r--r--openssl/crypto/whrlpool/asm/wp-x86_64.pl43
-rw-r--r--openssl/crypto/whrlpool/whrlpool.h50
-rw-r--r--openssl/crypto/whrlpool/wp_block.c1233
-rw-r--r--openssl/crypto/whrlpool/wp_dgst.c370
-rw-r--r--openssl/crypto/whrlpool/wp_locl.h2
-rw-r--r--openssl/crypto/whrlpool/wp_test.c389
7 files changed, 1132 insertions, 997 deletions
diff --git a/openssl/crypto/whrlpool/asm/wp-mmx.pl b/openssl/crypto/whrlpool/asm/wp-mmx.pl
index cb2381c22..c584e5b92 100644
--- a/openssl/crypto/whrlpool/asm/wp-mmx.pl
+++ b/openssl/crypto/whrlpool/asm/wp-mmx.pl
@@ -118,34 +118,36 @@ $tbl="ebp";
&movq (@mm[0],&QWP(2048*$SCALE,$tbl,"esi",8)); # rc[r]
&mov ("eax",&DWP(0,"esp"));
&mov ("ebx",&DWP(4,"esp"));
+ &movz ("ecx",&LB("eax"));
+ &movz ("edx",&HB("eax"));
for($i=0;$i<8;$i++) {
my $func = ($i==0)? \&movq : \&pxor;
- &movb (&LB("ecx"),&LB("eax"));
- &movb (&LB("edx"),&HB("eax"));
+ &shr ("eax",16);
&scale ("esi","ecx");
+ &movz ("ecx",&LB("eax"));
&scale ("edi","edx");
- &shr ("eax",16);
+ &movz ("edx",&HB("eax"));
&pxor (@mm[0],&QWP(&row(0),$tbl,"esi",8));
&$func (@mm[1],&QWP(&row(1),$tbl,"edi",8));
- &movb (&LB("ecx"),&LB("eax"));
- &movb (&LB("edx"),&HB("eax"));
&mov ("eax",&DWP(($i+1)*8,"esp"));
&scale ("esi","ecx");
+ &movz ("ecx",&LB("ebx"));
&scale ("edi","edx");
+ &movz ("edx",&HB("ebx"));
&$func (@mm[2],&QWP(&row(2),$tbl,"esi",8));
&$func (@mm[3],&QWP(&row(3),$tbl,"edi",8));
- &movb (&LB("ecx"),&LB("ebx"));
- &movb (&LB("edx"),&HB("ebx"));
+ &shr ("ebx",16);
&scale ("esi","ecx");
+ &movz ("ecx",&LB("ebx"));
&scale ("edi","edx");
- &shr ("ebx",16);
+ &movz ("edx",&HB("ebx"));
&$func (@mm[4],&QWP(&row(4),$tbl,"esi",8));
&$func (@mm[5],&QWP(&row(5),$tbl,"edi",8));
- &movb (&LB("ecx"),&LB("ebx"));
- &movb (&LB("edx"),&HB("ebx"));
&mov ("ebx",&DWP(($i+1)*8+4,"esp"));
&scale ("esi","ecx");
+ &movz ("ecx",&LB("eax"));
&scale ("edi","edx");
+ &movz ("edx",&HB("eax"));
&$func (@mm[6],&QWP(&row(6),$tbl,"esi",8));
&$func (@mm[7],&QWP(&row(7),$tbl,"edi",8));
push(@mm,shift(@mm));
@@ -154,32 +156,32 @@ for($i=0;$i<8;$i++) {
for($i=0;$i<8;$i++) { &movq(&QWP($i*8,"esp"),@mm[$i]); } # K=L
for($i=0;$i<8;$i++) {
- &movb (&LB("ecx"),&LB("eax"));
- &movb (&LB("edx"),&HB("eax"));
+ &shr ("eax",16);
&scale ("esi","ecx");
+ &movz ("ecx",&LB("eax"));
&scale ("edi","edx");
- &shr ("eax",16);
+ &movz ("edx",&HB("eax"));
&pxor (@mm[0],&QWP(&row(0),$tbl,"esi",8));
&pxor (@mm[1],&QWP(&row(1),$tbl,"edi",8));
- &movb (&LB("ecx"),&LB("eax"));
- &movb (&LB("edx"),&HB("eax"));
&mov ("eax",&DWP(64+($i+1)*8,"esp")) if ($i<7);
&scale ("esi","ecx");
+ &movz ("ecx",&LB("ebx"));
&scale ("edi","edx");
+ &movz ("edx",&HB("ebx"));
&pxor (@mm[2],&QWP(&row(2),$tbl,"esi",8));
&pxor (@mm[3],&QWP(&row(3),$tbl,"edi",8));
- &movb (&LB("ecx"),&LB("ebx"));
- &movb (&LB("edx"),&HB("ebx"));
+ &shr ("ebx",16);
&scale ("esi","ecx");
+ &movz ("ecx",&LB("ebx"));
&scale ("edi","edx");
- &shr ("ebx",16);
+ &movz ("edx",&HB("ebx"));
&pxor (@mm[4],&QWP(&row(4),$tbl,"esi",8));
&pxor (@mm[5],&QWP(&row(5),$tbl,"edi",8));
- &movb (&LB("ecx"),&LB("ebx"));
- &movb (&LB("edx"),&HB("ebx"));
&mov ("ebx",&DWP(64+($i+1)*8+4,"esp")) if ($i<7);
&scale ("esi","ecx");
+ &movz ("ecx",&LB("eax"));
&scale ("edi","edx");
+ &movz ("edx",&HB("eax"));
&pxor (@mm[6],&QWP(&row(6),$tbl,"esi",8));
&pxor (@mm[7],&QWP(&row(7),$tbl,"edi",8));
push(@mm,shift(@mm));
diff --git a/openssl/crypto/whrlpool/asm/wp-x86_64.pl b/openssl/crypto/whrlpool/asm/wp-x86_64.pl
index 24b2ff60c..5a3bdbcf2 100644
--- a/openssl/crypto/whrlpool/asm/wp-x86_64.pl
+++ b/openssl/crypto/whrlpool/asm/wp-x86_64.pl
@@ -91,41 +91,44 @@ for($i=0;$i<8;$i++) { $code.="mov @mm[$i],64+$i*8(%rsp)\n"; } # S=L
$code.=<<___;
xor %rsi,%rsi
mov %rsi,24(%rbx) # zero round counter
+ jmp .Lround
.align 16
.Lround:
mov 4096(%rbp,%rsi,8),@mm[0] # rc[r]
mov 0(%rsp),%eax
mov 4(%rsp),%ebx
+ movz %al,%ecx
+ movz %ah,%edx
___
for($i=0;$i<8;$i++) {
my $func = ($i==0)? "mov" : "xor";
$code.=<<___;
- mov %al,%cl
- mov %ah,%dl
+ shr \$16,%eax
lea (%rcx,%rcx),%rsi
+ movz %al,%ecx
lea (%rdx,%rdx),%rdi
- shr \$16,%eax
+ movz %ah,%edx
xor 0(%rbp,%rsi,8),@mm[0]
$func 7(%rbp,%rdi,8),@mm[1]
- mov %al,%cl
- mov %ah,%dl
mov $i*8+8(%rsp),%eax # ($i+1)*8
lea (%rcx,%rcx),%rsi
+ movz %bl,%ecx
lea (%rdx,%rdx),%rdi
+ movz %bh,%edx
$func 6(%rbp,%rsi,8),@mm[2]
$func 5(%rbp,%rdi,8),@mm[3]
- mov %bl,%cl
- mov %bh,%dl
+ shr \$16,%ebx
lea (%rcx,%rcx),%rsi
+ movz %bl,%ecx
lea (%rdx,%rdx),%rdi
- shr \$16,%ebx
+ movz %bh,%edx
$func 4(%rbp,%rsi,8),@mm[4]
$func 3(%rbp,%rdi,8),@mm[5]
- mov %bl,%cl
- mov %bh,%dl
mov $i*8+8+4(%rsp),%ebx # ($i+1)*8+4
lea (%rcx,%rcx),%rsi
+ movz %al,%ecx
lea (%rdx,%rdx),%rdi
+ movz %ah,%edx
$func 2(%rbp,%rsi,8),@mm[6]
$func 1(%rbp,%rdi,8),@mm[7]
___
@@ -134,32 +137,32 @@ ___
for($i=0;$i<8;$i++) { $code.="mov @mm[$i],$i*8(%rsp)\n"; } # K=L
for($i=0;$i<8;$i++) {
$code.=<<___;
- mov %al,%cl
- mov %ah,%dl
+ shr \$16,%eax
lea (%rcx,%rcx),%rsi
+ movz %al,%ecx
lea (%rdx,%rdx),%rdi
- shr \$16,%eax
+ movz %ah,%edx
xor 0(%rbp,%rsi,8),@mm[0]
xor 7(%rbp,%rdi,8),@mm[1]
- mov %al,%cl
- mov %ah,%dl
`"mov 64+$i*8+8(%rsp),%eax" if($i<7);` # 64+($i+1)*8
lea (%rcx,%rcx),%rsi
+ movz %bl,%ecx
lea (%rdx,%rdx),%rdi
+ movz %bh,%edx
xor 6(%rbp,%rsi,8),@mm[2]
xor 5(%rbp,%rdi,8),@mm[3]
- mov %bl,%cl
- mov %bh,%dl
+ shr \$16,%ebx
lea (%rcx,%rcx),%rsi
+ movz %bl,%ecx
lea (%rdx,%rdx),%rdi
- shr \$16,%ebx
+ movz %bh,%edx
xor 4(%rbp,%rsi,8),@mm[4]
xor 3(%rbp,%rdi,8),@mm[5]
- mov %bl,%cl
- mov %bh,%dl
`"mov 64+$i*8+8+4(%rsp),%ebx" if($i<7);` # 64+($i+1)*8+4
lea (%rcx,%rcx),%rsi
+ movz %al,%ecx
lea (%rdx,%rdx),%rdi
+ movz %ah,%edx
xor 2(%rbp,%rsi,8),@mm[6]
xor 1(%rbp,%rdi,8),@mm[7]
___
diff --git a/openssl/crypto/whrlpool/whrlpool.h b/openssl/crypto/whrlpool/whrlpool.h
index 9e01f5b07..73c749da8 100644
--- a/openssl/crypto/whrlpool/whrlpool.h
+++ b/openssl/crypto/whrlpool/whrlpool.h
@@ -1,38 +1,38 @@
#ifndef HEADER_WHRLPOOL_H
-#define HEADER_WHRLPOOL_H
+# define HEADER_WHRLPOOL_H
-#include <openssl/e_os2.h>
-#include <stddef.h>
+# include <openssl/e_os2.h>
+# include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
-#define WHIRLPOOL_DIGEST_LENGTH (512/8)
-#define WHIRLPOOL_BBLOCK 512
-#define WHIRLPOOL_COUNTER (256/8)
+# define WHIRLPOOL_DIGEST_LENGTH (512/8)
+# define WHIRLPOOL_BBLOCK 512
+# define WHIRLPOOL_COUNTER (256/8)
-typedef struct {
- union {
- unsigned char c[WHIRLPOOL_DIGEST_LENGTH];
- /* double q is here to ensure 64-bit alignment */
- double q[WHIRLPOOL_DIGEST_LENGTH/sizeof(double)];
- } H;
- unsigned char data[WHIRLPOOL_BBLOCK/8];
- unsigned int bitoff;
- size_t bitlen[WHIRLPOOL_COUNTER/sizeof(size_t)];
- } WHIRLPOOL_CTX;
+typedef struct {
+ union {
+ unsigned char c[WHIRLPOOL_DIGEST_LENGTH];
+ /* double q is here to ensure 64-bit alignment */
+ double q[WHIRLPOOL_DIGEST_LENGTH / sizeof(double)];
+ } H;
+ unsigned char data[WHIRLPOOL_BBLOCK / 8];
+ unsigned int bitoff;
+ size_t bitlen[WHIRLPOOL_COUNTER / sizeof(size_t)];
+} WHIRLPOOL_CTX;
-#ifndef OPENSSL_NO_WHIRLPOOL
-#ifdef OPENSSL_FIPS
+# ifndef OPENSSL_NO_WHIRLPOOL
+# ifdef OPENSSL_FIPS
int private_WHIRLPOOL_Init(WHIRLPOOL_CTX *c);
-#endif
-int WHIRLPOOL_Init (WHIRLPOOL_CTX *c);
-int WHIRLPOOL_Update (WHIRLPOOL_CTX *c,const void *inp,size_t bytes);
-void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c,const void *inp,size_t bits);
-int WHIRLPOOL_Final (unsigned char *md,WHIRLPOOL_CTX *c);
-unsigned char *WHIRLPOOL(const void *inp,size_t bytes,unsigned char *md);
-#endif
+# endif
+int WHIRLPOOL_Init(WHIRLPOOL_CTX *c);
+int WHIRLPOOL_Update(WHIRLPOOL_CTX *c, const void *inp, size_t bytes);
+void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *inp, size_t bits);
+int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c);
+unsigned char *WHIRLPOOL(const void *inp, size_t bytes, unsigned char *md);
+# endif
#ifdef __cplusplus
}
diff --git a/openssl/crypto/whrlpool/wp_block.c b/openssl/crypto/whrlpool/wp_block.c
index 824ed1827..920430bd6 100644
--- a/openssl/crypto/whrlpool/wp_block.c
+++ b/openssl/crypto/whrlpool/wp_block.c
@@ -38,86 +38,93 @@
#include "wp_locl.h"
#include <string.h>
-typedef unsigned char u8;
+typedef unsigned char u8;
#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32)
-typedef unsigned __int64 u64;
+typedef unsigned __int64 u64;
#elif defined(__arch64__)
-typedef unsigned long u64;
+typedef unsigned long u64;
#else
-typedef unsigned long long u64;
+typedef unsigned long long u64;
#endif
-#define ROUNDS 10
+#define ROUNDS 10
#define STRICT_ALIGNMENT
#if defined(__i386) || defined(__i386__) || \
defined(__x86_64) || defined(__x86_64__) || \
defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64)
-/* Well, formally there're couple of other architectures, which permit
- * unaligned loads, specifically those not crossing cache lines, IA-64
- * and PowerPC... */
-# undef STRICT_ALIGNMENT
+/*
+ * Well, formally there're couple of other architectures, which permit
+ * unaligned loads, specifically those not crossing cache lines, IA-64 and
+ * PowerPC...
+ */
+# undef STRICT_ALIGNMENT
#endif
#undef SMALL_REGISTER_BANK
#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
-# define SMALL_REGISTER_BANK
-# if defined(WHIRLPOOL_ASM)
-# ifndef OPENSSL_SMALL_FOOTPRINT
-# define OPENSSL_SMALL_FOOTPRINT /* it appears that for elder non-MMX
- CPUs this is actually faster! */
-# endif
-# define GO_FOR_MMX(ctx,inp,num) do { \
- extern unsigned int OPENSSL_ia32cap_P[]; \
- void whirlpool_block_mmx(void *,const void *,size_t); \
- if (!(OPENSSL_ia32cap_P[0] & (1<<23))) break; \
- whirlpool_block_mmx(ctx->H.c,inp,num); return; \
- } while (0)
+# define SMALL_REGISTER_BANK
+# if defined(WHIRLPOOL_ASM)
+# ifndef OPENSSL_SMALL_FOOTPRINT
+/*
+ * it appears that for elder non-MMX
+ * CPUs this is actually faster!
+ */
+# define OPENSSL_SMALL_FOOTPRINT
# endif
+# define GO_FOR_MMX(ctx,inp,num) do { \
+ extern unsigned int OPENSSL_ia32cap_P[]; \
+ void whirlpool_block_mmx(void *,const void *,size_t); \
+ if (!(OPENSSL_ia32cap_P[0] & (1<<23))) break; \
+ whirlpool_block_mmx(ctx->H.c,inp,num); return; \
+ } while (0)
+# endif
#endif
#undef ROTATE
#if defined(_MSC_VER)
-# if defined(_WIN64) /* applies to both IA-64 and AMD64 */
-# pragma intrinsic(_rotl64)
-# define ROTATE(a,n) _rotl64((a),n)
-# endif
+# if defined(_WIN64) /* applies to both IA-64 and AMD64 */
+# pragma intrinsic(_rotl64)
+# define ROTATE(a,n) _rotl64((a),n)
+# endif
#elif defined(__GNUC__) && __GNUC__>=2
-# if defined(__x86_64) || defined(__x86_64__)
-# if defined(L_ENDIAN)
-# define ROTATE(a,n) ({ u64 ret; asm ("rolq %1,%0" \
- : "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; })
-# elif defined(B_ENDIAN)
- /* Most will argue that x86_64 is always little-endian. Well,
- * yes, but then we have stratus.com who has modified gcc to
- * "emulate" big-endian on x86. Is there evidence that they
- * [or somebody else] won't do same for x86_64? Naturally no.
- * And this line is waiting ready for that brave soul:-) */
-# define ROTATE(a,n) ({ u64 ret; asm ("rorq %1,%0" \
- : "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; })
-# endif
-# elif defined(__ia64) || defined(__ia64__)
-# if defined(L_ENDIAN)
-# define ROTATE(a,n) ({ u64 ret; asm ("shrp %0=%1,%1,%2" \
- : "=r"(ret) : "r"(a),"M"(64-(n))); ret; })
-# elif defined(B_ENDIAN)
-# define ROTATE(a,n) ({ u64 ret; asm ("shrp %0=%1,%1,%2" \
- : "=r"(ret) : "r"(a),"M"(n)); ret; })
-# endif
+# if defined(__x86_64) || defined(__x86_64__)
+# if defined(L_ENDIAN)
+# define ROTATE(a,n) ({ u64 ret; asm ("rolq %1,%0" \
+ : "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; })
+# elif defined(B_ENDIAN)
+ /*
+ * Most will argue that x86_64 is always little-endian. Well, yes, but
+ * then we have stratus.com who has modified gcc to "emulate"
+ * big-endian on x86. Is there evidence that they [or somebody else]
+ * won't do same for x86_64? Naturally no. And this line is waiting
+ * ready for that brave soul:-)
+ */
+# define ROTATE(a,n) ({ u64 ret; asm ("rorq %1,%0" \
+ : "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; })
# endif
+# elif defined(__ia64) || defined(__ia64__)
+# if defined(L_ENDIAN)
+# define ROTATE(a,n) ({ u64 ret; asm ("shrp %0=%1,%1,%2" \
+ : "=r"(ret) : "r"(a),"M"(64-(n))); ret; })
+# elif defined(B_ENDIAN)
+# define ROTATE(a,n) ({ u64 ret; asm ("shrp %0=%1,%1,%2" \
+ : "=r"(ret) : "r"(a),"M"(n)); ret; })
+# endif
+# endif
#endif
#if defined(OPENSSL_SMALL_FOOTPRINT)
-# if !defined(ROTATE)
-# if defined(L_ENDIAN) /* little-endians have to rotate left */
-# define ROTATE(i,n) ((i)<<(n) ^ (i)>>(64-n))
-# elif defined(B_ENDIAN) /* big-endians have to rotate right */
-# define ROTATE(i,n) ((i)>>(n) ^ (i)<<(64-n))
-# endif
-# endif
-# if defined(ROTATE) && !defined(STRICT_ALIGNMENT)
-# define STRICT_ALIGNMENT /* ensure smallest table size */
+# if !defined(ROTATE)
+# if defined(L_ENDIAN) /* little-endians have to rotate left */
+# define ROTATE(i,n) ((i)<<(n) ^ (i)>>(64-n))
+# elif defined(B_ENDIAN) /* big-endians have to rotate right */
+# define ROTATE(i,n) ((i)>>(n) ^ (i)<<(64-n))
# endif
+# endif
+# if defined(ROTATE) && !defined(STRICT_ALIGNMENT)
+# define STRICT_ALIGNMENT /* ensure smallest table size */
+# endif
#endif
/*
@@ -144,512 +151,630 @@ typedef unsigned long long u64;
* Hand-coded assembler would be another alternative:-)
*/
#ifdef STRICT_ALIGNMENT
-# if defined(ROTATE)
-# define N 1
-# define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7
-# define C0(K,i) (Cx.q[K.c[(i)*8+0]])
-# define C1(K,i) ROTATE(Cx.q[K.c[(i)*8+1]],8)
-# define C2(K,i) ROTATE(Cx.q[K.c[(i)*8+2]],16)
-# define C3(K,i) ROTATE(Cx.q[K.c[(i)*8+3]],24)
-# define C4(K,i) ROTATE(Cx.q[K.c[(i)*8+4]],32)
-# define C5(K,i) ROTATE(Cx.q[K.c[(i)*8+5]],40)
-# define C6(K,i) ROTATE(Cx.q[K.c[(i)*8+6]],48)
-# define C7(K,i) ROTATE(Cx.q[K.c[(i)*8+7]],56)
-# else
-# define N 8
-# define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7, \
- c7,c0,c1,c2,c3,c4,c5,c6, \
- c6,c7,c0,c1,c2,c3,c4,c5, \
- c5,c6,c7,c0,c1,c2,c3,c4, \
- c4,c5,c6,c7,c0,c1,c2,c3, \
- c3,c4,c5,c6,c7,c0,c1,c2, \
- c2,c3,c4,c5,c6,c7,c0,c1, \
- c1,c2,c3,c4,c5,c6,c7,c0
-# define C0(K,i) (Cx.q[0+8*K.c[(i)*8+0]])
-# define C1(K,i) (Cx.q[1+8*K.c[(i)*8+1]])
-# define C2(K,i) (Cx.q[2+8*K.c[(i)*8+2]])
-# define C3(K,i) (Cx.q[3+8*K.c[(i)*8+3]])
-# define C4(K,i) (Cx.q[4+8*K.c[(i)*8+4]])
-# define C5(K,i) (Cx.q[5+8*K.c[(i)*8+5]])
-# define C6(K,i) (Cx.q[6+8*K.c[(i)*8+6]])
-# define C7(K,i) (Cx.q[7+8*K.c[(i)*8+7]])
-# endif
+# if defined(ROTATE)
+# define N 1
+# define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7
+# define C0(K,i) (Cx.q[K.c[(i)*8+0]])
+# define C1(K,i) ROTATE(Cx.q[K.c[(i)*8+1]],8)
+# define C2(K,i) ROTATE(Cx.q[K.c[(i)*8+2]],16)
+# define C3(K,i) ROTATE(Cx.q[K.c[(i)*8+3]],24)
+# define C4(K,i) ROTATE(Cx.q[K.c[(i)*8+4]],32)
+# define C5(K,i) ROTATE(Cx.q[K.c[(i)*8+5]],40)
+# define C6(K,i) ROTATE(Cx.q[K.c[(i)*8+6]],48)
+# define C7(K,i) ROTATE(Cx.q[K.c[(i)*8+7]],56)
+# else
+# define N 8
+# define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7, \
+ c7,c0,c1,c2,c3,c4,c5,c6, \
+ c6,c7,c0,c1,c2,c3,c4,c5, \
+ c5,c6,c7,c0,c1,c2,c3,c4, \
+ c4,c5,c6,c7,c0,c1,c2,c3, \
+ c3,c4,c5,c6,c7,c0,c1,c2, \
+ c2,c3,c4,c5,c6,c7,c0,c1, \
+ c1,c2,c3,c4,c5,c6,c7,c0
+# define C0(K,i) (Cx.q[0+8*K.c[(i)*8+0]])
+# define C1(K,i) (Cx.q[1+8*K.c[(i)*8+1]])
+# define C2(K,i) (Cx.q[2+8*K.c[(i)*8+2]])
+# define C3(K,i) (Cx.q[3+8*K.c[(i)*8+3]])
+# define C4(K,i) (Cx.q[4+8*K.c[(i)*8+4]])
+# define C5(K,i) (Cx.q[5+8*K.c[(i)*8+5]])
+# define C6(K,i) (Cx.q[6+8*K.c[(i)*8+6]])
+# define C7(K,i) (Cx.q[7+8*K.c[(i)*8+7]])
+# endif
#else
-# define N 2
-# define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7, \
- c0,c1,c2,c3,c4,c5,c6,c7
-# define C0(K,i) (((u64*)(Cx.c+0))[2*K.c[(i)*8+0]])
-# define C1(K,i) (((u64*)(Cx.c+7))[2*K.c[(i)*8+1]])
-# define C2(K,i) (((u64*)(Cx.c+6))[2*K.c[(i)*8+2]])
-# define C3(K,i) (((u64*)(Cx.c+5))[2*K.c[(i)*8+3]])
-# define C4(K,i) (((u64*)(Cx.c+4))[2*K.c[(i)*8+4]])
-# define C5(K,i) (((u64*)(Cx.c+3))[2*K.c[(i)*8+5]])
-# define C6(K,i) (((u64*)(Cx.c+2))[2*K.c[(i)*8+6]])
-# define C7(K,i) (((u64*)(Cx.c+1))[2*K.c[(i)*8+7]])
+# define N 2
+# define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7, \
+ c0,c1,c2,c3,c4,c5,c6,c7
+# define C0(K,i) (((u64*)(Cx.c+0))[2*K.c[(i)*8+0]])
+# define C1(K,i) (((u64*)(Cx.c+7))[2*K.c[(i)*8+1]])
+# define C2(K,i) (((u64*)(Cx.c+6))[2*K.c[(i)*8+2]])
+# define C3(K,i) (((u64*)(Cx.c+5))[2*K.c[(i)*8+3]])
+# define C4(K,i) (((u64*)(Cx.c+4))[2*K.c[(i)*8+4]])
+# define C5(K,i) (((u64*)(Cx.c+3))[2*K.c[(i)*8+5]])
+# define C6(K,i) (((u64*)(Cx.c+2))[2*K.c[(i)*8+6]])
+# define C7(K,i) (((u64*)(Cx.c+1))[2*K.c[(i)*8+7]])
#endif
static const
-union {
- u8 c[(256*N+ROUNDS)*sizeof(u64)];
- u64 q[(256*N+ROUNDS)];
- } Cx = { {
- /* Note endian-neutral representation:-) */
- LL(0x18,0x18,0x60,0x18,0xc0,0x78,0x30,0xd8),
- LL(0x23,0x23,0x8c,0x23,0x05,0xaf,0x46,0x26),
- LL(0xc6,0xc6,0x3f,0xc6,0x7e,0xf9,0x91,0xb8),
- LL(0xe8,0xe8,0x87,0xe8,0x13,0x6f,0xcd,0xfb),
- LL(0x87,0x87,0x26,0x87,0x4c,0xa1,0x13,0xcb),
- LL(0xb8,0xb8,0xda,0xb8,0xa9,0x62,0x6d,0x11),
- LL(0x01,0x01,0x04,0x01,0x08,0x05,0x02,0x09),
- LL(0x4f,0x4f,0x21,0x4f,0x42,0x6e,0x9e,0x0d),
- LL(0x36,0x36,0xd8,0x36,0xad,0xee,0x6c,0x9b),
- LL(0xa6,0xa6,0xa2,0xa6,0x59,0x04,0x51,0xff),
- LL(0xd2,0xd2,0x6f,0xd2,0xde,0xbd,0xb9,0x0c),
- LL(0xf5,0xf5,0xf3,0xf5,0xfb,0x06,0xf7,0x0e),
- LL(0x79,0x79,0xf9,0x79,0xef,0x80,0xf2,0x96),
- LL(0x6f,0x6f,0xa1,0x6f,0x5f,0xce,0xde,0x30),
- LL(0x91,0x91,0x7e,0x91,0xfc,0xef,0x3f,0x6d),
- LL(0x52,0x52,0x55,0x52,0xaa,0x07,0xa4,0xf8),
- LL(0x60,0x60,0x9d,0x60,0x27,0xfd,0xc0,0x47),
- LL(0xbc,0xbc,0xca,0xbc,0x89,0x76,0x65,0x35),
- LL(0x9b,0x9b,0x56,0x9b,0xac,0xcd,0x2b,0x37),
- LL(0x8e,0x8e,0x02,0x8e,0x04,0x8c,0x01,0x8a),
- LL(0xa3,0xa3,0xb6,0xa3,0x71,0x15,0x5b,0xd2),
- LL(0x0c,0x0c,0x30,0x0c,0x60,0x3c,0x18,0x6c),
- LL(0x7b,0x7b,0xf1,0x7b,0xff,0x8a,0xf6,0x84),
- LL(0x35,0x35,0xd4,0x35,0xb5,0xe1,0x6a,0x80),
- LL(0x1d,0x1d,0x74,0x1d,0xe8,0x69,0x3a,0xf5),
- LL(0xe0,0xe0,0xa7,0xe0,0x53,0x47,0xdd,0xb3),
- LL(0xd7,0xd7,0x7b,0xd7,0xf6,0xac,0xb3,0x21),
- LL(0xc2,0xc2,0x2f,0xc2,0x5e,0xed,0x99,0x9c),
- LL(0x2e,0x2e,0xb8,0x2e,0x6d,0x96,0x5c,0x43),
- LL(0x4b,0x4b,0x31,0x4b,0x62,0x7a,0x96,0x29),
- LL(0xfe,0xfe,0xdf,0xfe,0xa3,0x21,0xe1,0x5d),
- LL(0x57,0x57,0x41,0x57,0x82,0x16,0xae,0xd5),
- LL(0x15,0x15,0x54,0x15,0xa8,0x41,0x2a,0xbd),
- LL(0x77,0x77,0xc1,0x77,0x9f,0xb6,0xee,0xe8),
- LL(0x37,0x37,0xdc,0x37,0xa5,0xeb,0x6e,0x92),
- LL(0xe5,0xe5,0xb3,0xe5,0x7b,0x56,0xd7,0x9e),
- LL(0x9f,0x9f,0x46,0x9f,0x8c,0xd9,0x23,0x13),
- LL(0xf0,0xf0,0xe7,0xf0,0xd3,0x17,0xfd,0x23),
- LL(0x4a,0x4a,0x35,0x4a,0x6a,0x7f,0x94,0x20),
- LL(0xda,0xda,0x4f,0xda,0x9e,0x95,0xa9,0x44),
- LL(0x58,0x58,0x7d,0x58,0xfa,0x25,0xb0,0xa2),
- LL(0xc9,0xc9,0x03,0xc9,0x06,0xca,0x8f,0xcf),
- LL(0x29,0x29,0xa4,0x29,0x55,0x8d,0x52,0x7c),
- LL(0x0a,0x0a,0x28,0x0a,0x50,0x22,0x14,0x5a),
- LL(0xb1,0xb1,0xfe,0xb1,0xe1,0x4f,0x7f,0x50),
- LL(0xa0,0xa0,0xba,0xa0,0x69,0x1a,0x5d,0xc9),
- LL(0x6b,0x6b,0xb1,0x6b,0x7f,0xda,0xd6,0x14),
- LL(0x85,0x85,0x2e,0x85,0x5c,0xab,0x17,0xd9),
- LL(0xbd,0xbd,0xce,0xbd,0x81,0x73,0x67,0x3c),
- LL(0x5d,0x5d,0x69,0x5d,0xd2,0x34,0xba,0x8f),
- LL(0x10,0x10,0x40,0x10,0x80,0x50,0x20,0x90),
- LL(0xf4,0xf4,0xf7,0xf4,0xf3,0x03,0xf5,0x07),
- LL(0xcb,0xcb,0x0b,0xcb,0x16,0xc0,0x8b,0xdd),
- LL(0x3e,0x3e,0xf8,0x3e,0xed,0xc6,0x7c,0xd3),
- LL(0x05,0x05,0x14,0x05,0x28,0x11,0x0a,0x2d),
- LL(0x67,0x67,0x81,0x67,0x1f,0xe6,0xce,0x78),
- LL(0xe4,0xe4,0xb7,0xe4,0x73,0x53,0xd5,0x97),
- LL(0x27,0x27,0x9c,0x27,0x25,0xbb,0x4e,0x02),
- LL(0x41,0x41,0x19,0x41,0x32,0x58,0x82,0x73),
- LL(0x8b,0x8b,0x16,0x8b,0x2c,0x9d,0x0b,0xa7),
- LL(0xa7,0xa7,0xa6,0xa7,0x51,0x01,0x53,0xf6),
- LL(0x7d,0x7d,0xe9,0x7d,0xcf,0x94,0xfa,0xb2),
- LL(0x95,0x95,0x6e,0x95,0xdc,0xfb,0x37,0x49),
- LL(0xd8,0xd8,0x47,0xd8,0x8e,0x9f,0xad,0x56),
- LL(0xfb,0xfb,0xcb,0xfb,0x8b,0x30,0xeb,0x70),
- LL(0xee,0xee,0x9f,0xee,0x23,0x71,0xc1,0xcd),
- LL(0x7c,0x7c,0xed,0x7c,0xc7,0x91,0xf8,0xbb),
- LL(0x66,0x66,0x85,0x66,0x17,0xe3,0xcc,0x71),
- LL(0xdd,0xdd,0x53,0xdd,0xa6,0x8e,0xa7,0x7b),
- LL(0x17,0x17,0x5c,0x17,0xb8,0x4b,0x2e,0xaf),
- LL(0x47,0x47,0x01,0x47,0x02,0x46,0x8e,0x45),
- LL(0x9e,0x9e,0x42,0x9e,0x84,0xdc,0x21,0x1a),
- LL(0xca,0xca,0x0f,0xca,0x1e,0xc5,0x89,0xd4),
- LL(0x2d,0x2d,0xb4,0x2d,0x75,0x99,0x5a,0x58),
- LL(0xbf,0xbf,0xc6,0xbf,0x91,0x79,0x63,0x2e),
- LL(0x07,0x07,0x1c,0x07,0x38,0x1b,0x0e,0x3f),
- LL(0xad,0xad,0x8e,0xad,0x01,0x23,0x47,0xac),
- LL(0x5a,0x5a,0x75,0x5a,0xea,0x2f,0xb4,0xb0),
- LL(0x83,0x83,0x36,0x83,0x6c,0xb5,0x1b,0xef),
- LL(0x33,0x33,0xcc,0x33,0x85,0xff,0x66,0xb6),
- LL(0x63,0x63,0x91,0x63,0x3f,0xf2,0xc6,0x5c),
- LL(0x02,0x02,0x08,0x02,0x10,0x0a,0x04,0x12),
- LL(0xaa,0xaa,0x92,0xaa,0x39,0x38,0x49,0x93),
- LL(0x71,0x71,0xd9,0x71,0xaf,0xa8,0xe2,0xde),
- LL(0xc8,0xc8,0x07,0xc8,0x0e,0xcf,0x8d,0xc6),
- LL(0x19,0x19,0x64,0x19,0xc8,0x7d,0x32,0xd1),
- LL(0x49,0x49,0x39,0x49,0x72,0x70,0x92,0x3b),
- LL(0xd9,0xd9,0x43,0xd9,0x86,0x9a,0xaf,0x5f),
- LL(0xf2,0xf2,0xef,0xf2,0xc3,0x1d,0xf9,0x31),
- LL(0xe3,0xe3,0xab,0xe3,0x4b,0x48,0xdb,0xa8),
- LL(0x5b,0x5b,0x71,0x5b,0xe2,0x2a,0xb6,0xb9),
- LL(0x88,0x88,0x1a,0x88,0x34,0x92,0x0d,0xbc),
- LL(0x9a,0x9a,0x52,0x9a,0xa4,0xc8,0x29,0x3e),
- LL(0x26,0x26,0x98,0x26,0x2d,0xbe,0x4c,0x0b),
- LL(0x32,0x32,0xc8,0x32,0x8d,0xfa,0x64,0xbf),
- LL(0xb0,0xb0,0xfa,0xb0,0xe9,0x4a,0x7d,0x59),
- LL(0xe9,0xe9,0x83,0xe9,0x1b,0x6a,0xcf,0xf2),
- LL(0x0f,0x0f,0x3c,0x0f,0x78,0x33,0x1e,0x77),
- LL(0xd5,0xd5,0x73,0xd5,0xe6,0xa6,0xb7,0x33),
- LL(0x80,0x80,0x3a,0x80,0x74,0xba,0x1d,0xf4),
- LL(0xbe,0xbe,0xc2,0xbe,0x99,0x7c,0x61,0x27),
- LL(0xcd,0xcd,0x13,0xcd,0x26,0xde,0x87,0xeb),
- LL(0x34,0x34,0xd0,0x34,0xbd,0xe4,0x68,0x89),
- LL(0x48,0x48,0x3d,0x48,0x7a,0x75,0x90,0x32),
- LL(0xff,0xff,0xdb,0xff,0xab,0x24,0xe3,0x54),
- LL(0x7a,0x7a,0xf5,0x7a,0xf7,0x8f,0xf4,0x8d),
- LL(0x90,0x90,0x7a,0x90,0xf4,0xea,0x3d,0x64),
- LL(0x5f,0x5f,0x61,0x5f,0xc2,0x3e,0xbe,0x9d),
- LL(0x20,0x20,0x80,0x20,0x1d,0xa0,0x40,0x3d),
- LL(0x68,0x68,0xbd,0x68,0x67,0xd5,0xd0,0x0f),
- LL(0x1a,0x1a,0x68,0x1a,0xd0,0x72,0x34,0xca),
- LL(0xae,0xae,0x82,0xae,0x19,0x2c,0x41,0xb7),
- LL(0xb4,0xb4,0xea,0xb4,0xc9,0x5e,0x75,0x7d),
- LL(0x54,0x54,0x4d,0x54,0x9a,0x19,0xa8,0xce),
- LL(0x93,0x93,0x76,0x93,0xec,0xe5,0x3b,0x7f),
- LL(0x22,0x22,0x88,0x22,0x0d,0xaa,0x44,0x2f),
- LL(0x64,0x64,0x8d,0x64,0x07,0xe9,0xc8,0x63),
- LL(0xf1,0xf1,0xe3,0xf1,0xdb,0x12,0xff,0x2a),
- LL(0x73,0x73,0xd1,0x73,0xbf,0xa2,0xe6,0xcc),
- LL(0x12,0x12,0x48,0x12,0x90,0x5a,0x24,0x82),
- LL(0x40,0x40,0x1d,0x40,0x3a,0x5d,0x80,0x7a),
- LL(0x08,0x08,0x20,0x08,0x40,0x28,0x10,0x48),
- LL(0xc3,0xc3,0x2b,0xc3,0x56,0xe8,0x9b,0x95),
- LL(0xec,0xec,0x97,0xec,0x33,0x7b,0xc5,0xdf),
- LL(0xdb,0xdb,0x4b,0xdb,0x96,0x90,0xab,0x4d),
- LL(0xa1,0xa1,0xbe,0xa1,0x61,0x1f,0x5f,0xc0),
- LL(0x8d,0x8d,0x0e,0x8d,0x1c,0x83,0x07,0x91),
- LL(0x3d,0x3d,0xf4,0x3d,0xf5,0xc9,0x7a,0xc8),
- LL(0x97,0x97,0x66,0x97,0xcc,0xf1,0x33,0x5b),
- LL(0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00),
- LL(0xcf,0xcf,0x1b,0xcf,0x36,0xd4,0x83,0xf9),
- LL(0x2b,0x2b,0xac,0x2b,0x45,0x87,0x56,0x6e),
- LL(0x76,0x76,0xc5,0x76,0x97,0xb3,0xec,0xe1),
- LL(0x82,0x82,0x32,0x82,0x64,0xb0,0x19,0xe6),
- LL(0xd6,0xd6,0x7f,0xd6,0xfe,0xa9,0xb1,0x28),
- LL(0x1b,0x1b,0x6c,0x1b,0xd8,0x77,0x36,0xc3),
- LL(0xb5,0xb5,0xee,0xb5,0xc1,0x5b,0x77,0x74),
- LL(0xaf,0xaf,0x86,0xaf,0x11,0x29,0x43,0xbe),
- LL(0x6a,0x6a,0xb5,0x6a,0x77,0xdf,0xd4,0x1d),
- LL(0x50,0x50,0x5d,0x50,0xba,0x0d,0xa0,0xea),
- LL(0x45,0x45,0x09,0x45,0x12,0x4c,0x8a,0x57),
- LL(0xf3,0xf3,0xeb,0xf3,0xcb,0x18,0xfb,0x38),
- LL(0x30,0x30,0xc0,0x30,0x9d,0xf0,0x60,0xad),
- LL(0xef,0xef,0x9b,0xef,0x2b,0x74,0xc3,0xc4),
- LL(0x3f,0x3f,0xfc,0x3f,0xe5,0xc3,0x7e,0xda),
- LL(0x55,0x55,0x49,0x55,0x92,0x1c,0xaa,0xc7),
- LL(0xa2,0xa2,0xb2,0xa2,0x79,0x10,0x59,0xdb),
- LL(0xea,0xea,0x8f,0xea,0x03,0x65,0xc9,0xe9),
- LL(0x65,0x65,0x89,0x65,0x0f,0xec,0xca,0x6a),
- LL(0xba,0xba,0xd2,0xba,0xb9,0x68,0x69,0x03),
- LL(0x2f,0x2f,0xbc,0x2f,0x65,0x93,0x5e,0x4a),
- LL(0xc0,0xc0,0x27,0xc0,0x4e,0xe7,0x9d,0x8e),
- LL(0xde,0xde,0x5f,0xde,0xbe,0x81,0xa1,0x60),
- LL(0x1c,0x1c,0x70,0x1c,0xe0,0x6c,0x38,0xfc),
- LL(0xfd,0xfd,0xd3,0xfd,0xbb,0x2e,0xe7,0x46),
- LL(0x4d,0x4d,0x29,0x4d,0x52,0x64,0x9a,0x1f),
- LL(0x92,0x92,0x72,0x92,0xe4,0xe0,0x39,0x76),
- LL(0x75,0x75,0xc9,0x75,0x8f,0xbc,0xea,0xfa),
- LL(0x06,0x06,0x18,0x06,0x30,0x1e,0x0c,0x36),
- LL(0x8a,0x8a,0x12,0x8a,0x24,0x98,0x09,0xae),
- LL(0xb2,0xb2,0xf2,0xb2,0xf9,0x40,0x79,0x4b),
- LL(0xe6,0xe6,0xbf,0xe6,0x63,0x59,0xd1,0x85),
- LL(0x0e,0x0e,0x38,0x0e,0x70,0x36,0x1c,0x7e),
- LL(0x1f,0x1f,0x7c,0x1f,0xf8,0x63,0x3e,0xe7),
- LL(0x62,0x62,0x95,0x62,0x37,0xf7,0xc4,0x55),
- LL(0xd4,0xd4,0x77,0xd4,0xee,0xa3,0xb5,0x3a),
- LL(0xa8,0xa8,0x9a,0xa8,0x29,0x32,0x4d,0x81),
- LL(0x96,0x96,0x62,0x96,0xc4,0xf4,0x31,0x52),
- LL(0xf9,0xf9,0xc3,0xf9,0x9b,0x3a,0xef,0x62),
- LL(0xc5,0xc5,0x33,0xc5,0x66,0xf6,0x97,0xa3),
- LL(0x25,0x25,0x94,0x25,0x35,0xb1,0x4a,0x10),
- LL(0x59,0x59,0x79,0x59,0xf2,0x20,0xb2,0xab),
- LL(0x84,0x84,0x2a,0x84,0x54,0xae,0x15,0xd0),
- LL(0x72,0x72,0xd5,0x72,0xb7,0xa7,0xe4,0xc5),
- LL(0x39,0x39,0xe4,0x39,0xd5,0xdd,0x72,0xec),
- LL(0x4c,0x4c,0x2d,0x4c,0x5a,0x61,0x98,0x16),
- LL(0x5e,0x5e,0x65,0x5e,0xca,0x3b,0xbc,0x94),
- LL(0x78,0x78,0xfd,0x78,0xe7,0x85,0xf0,0x9f),
- LL(0x38,0x38,0xe0,0x38,0xdd,0xd8,0x70,0xe5),
- LL(0x8c,0x8c,0x0a,0x8c,0x14,0x86,0x05,0x98),
- LL(0xd1,0xd1,0x63,0xd1,0xc6,0xb2,0xbf,0x17),
- LL(0xa5,0xa5,0xae,0xa5,0x41,0x0b,0x57,0xe4),
- LL(0xe2,0xe2,0xaf,0xe2,0x43,0x4d,0xd9,0xa1),
- LL(0x61,0x61,0x99,0x61,0x2f,0xf8,0xc2,0x4e),
- LL(0xb3,0xb3,0xf6,0xb3,0xf1,0x45,0x7b,0x42),
- LL(0x21,0x21,0x84,0x21,0x15,0xa5,0x42,0x34),
- LL(0x9c,0x9c,0x4a,0x9c,0x94,0xd6,0x25,0x08),
- LL(0x1e,0x1e,0x78,0x1e,0xf0,0x66,0x3c,0xee),
- LL(0x43,0x43,0x11,0x43,0x22,0x52,0x86,0x61),
- LL(0xc7,0xc7,0x3b,0xc7,0x76,0xfc,0x93,0xb1),
- LL(0xfc,0xfc,0xd7,0xfc,0xb3,0x2b,0xe5,0x4f),
- LL(0x04,0x04,0x10,0x04,0x20,0x14,0x08,0x24),
- LL(0x51,0x51,0x59,0x51,0xb2,0x08,0xa2,0xe3),
- LL(0x99,0x99,0x5e,0x99,0xbc,0xc7,0x2f,0x25),
- LL(0x6d,0x6d,0xa9,0x6d,0x4f,0xc4,0xda,0x22),
- LL(0x0d,0x0d,0x34,0x0d,0x68,0x39,0x1a,0x65),
- LL(0xfa,0xfa,0xcf,0xfa,0x83,0x35,0xe9,0x79),
- LL(0xdf,0xdf,0x5b,0xdf,0xb6,0x84,0xa3,0x69),
- LL(0x7e,0x7e,0xe5,0x7e,0xd7,0x9b,0xfc,0xa9),
- LL(0x24,0x24,0x90,0x24,0x3d,0xb4,0x48,0x19),
- LL(0x3b,0x3b,0xec,0x3b,0xc5,0xd7,0x76,0xfe),
- LL(0xab,0xab,0x96,0xab,0x31,0x3d,0x4b,0x9a),
- LL(0xce,0xce,0x1f,0xce,0x3e,0xd1,0x81,0xf0),
- LL(0x11,0x11,0x44,0x11,0x88,0x55,0x22,0x99),
- LL(0x8f,0x8f,0x06,0x8f,0x0c,0x89,0x03,0x83),
- LL(0x4e,0x4e,0x25,0x4e,0x4a,0x6b,0x9c,0x04),
- LL(0xb7,0xb7,0xe6,0xb7,0xd1,0x51,0x73,0x66),
- LL(0xeb,0xeb,0x8b,0xeb,0x0b,0x60,0xcb,0xe0),
- LL(0x3c,0x3c,0xf0,0x3c,0xfd,0xcc,0x78,0xc1),
- LL(0x81,0x81,0x3e,0x81,0x7c,0xbf,0x1f,0xfd),
- LL(0x94,0x94,0x6a,0x94,0xd4,0xfe,0x35,0x40),
- LL(0xf7,0xf7,0xfb,0xf7,0xeb,0x0c,0xf3,0x1c),
- LL(0xb9,0xb9,0xde,0xb9,0xa1,0x67,0x6f,0x18),
- LL(0x13,0x13,0x4c,0x13,0x98,0x5f,0x26,0x8b),
- LL(0x2c,0x2c,0xb0,0x2c,0x7d,0x9c,0x58,0x51),
- LL(0xd3,0xd3,0x6b,0xd3,0xd6,0xb8,0xbb,0x05),
- LL(0xe7,0xe7,0xbb,0xe7,0x6b,0x5c,0xd3,0x8c),
- LL(0x6e,0x6e,0xa5,0x6e,0x57,0xcb,0xdc,0x39),
- LL(0xc4,0xc4,0x37,0xc4,0x6e,0xf3,0x95,0xaa),
- LL(0x03,0x03,0x0c,0x03,0x18,0x0f,0x06,0x1b),
- LL(0x56,0x56,0x45,0x56,0x8a,0x13,0xac,0xdc),
- LL(0x44,0x44,0x0d,0x44,0x1a,0x49,0x88,0x5e),
- LL(0x7f,0x7f,0xe1,0x7f,0xdf,0x9e,0xfe,0xa0),
- LL(0xa9,0xa9,0x9e,0xa9,0x21,0x37,0x4f,0x88),
- LL(0x2a,0x2a,0xa8,0x2a,0x4d,0x82,0x54,0x67),
- LL(0xbb,0xbb,0xd6,0xbb,0xb1,0x6d,0x6b,0x0a),
- LL(0xc1,0xc1,0x23,0xc1,0x46,0xe2,0x9f,0x87),
- LL(0x53,0x53,0x51,0x53,0xa2,0x02,0xa6,0xf1),
- LL(0xdc,0xdc,0x57,0xdc,0xae,0x8b,0xa5,0x72),
- LL(0x0b,0x0b,0x2c,0x0b,0x58,0x27,0x16,0x53),
- LL(0x9d,0x9d,0x4e,0x9d,0x9c,0xd3,0x27,0x01),
- LL(0x6c,0x6c,0xad,0x6c,0x47,0xc1,0xd8,0x2b),
- LL(0x31,0x31,0xc4,0x31,0x95,0xf5,0x62,0xa4),
- LL(0x74,0x74,0xcd,0x74,0x87,0xb9,0xe8,0xf3),
- LL(0xf6,0xf6,0xff,0xf6,0xe3,0x09,0xf1,0x15),
- LL(0x46,0x46,0x05,0x46,0x0a,0x43,0x8c,0x4c),
- LL(0xac,0xac,0x8a,0xac,0x09,0x26,0x45,0xa5),
- LL(0x89,0x89,0x1e,0x89,0x3c,0x97,0x0f,0xb5),
- LL(0x14,0x14,0x50,0x14,0xa0,0x44,0x28,0xb4),
- LL(0xe1,0xe1,0xa3,0xe1,0x5b,0x42,0xdf,0xba),
- LL(0x16,0x16,0x58,0x16,0xb0,0x4e,0x2c,0xa6),
- LL(0x3a,0x3a,0xe8,0x3a,0xcd,0xd2,0x74,0xf7),
- LL(0x69,0x69,0xb9,0x69,0x6f,0xd0,0xd2,0x06),
- LL(0x09,0x09,0x24,0x09,0x48,0x2d,0x12,0x41),
- LL(0x70,0x70,0xdd,0x70,0xa7,0xad,0xe0,0xd7),
- LL(0xb6,0xb6,0xe2,0xb6,0xd9,0x54,0x71,0x6f),
- LL(0xd0,0xd0,0x67,0xd0,0xce,0xb7,0xbd,0x1e),
- LL(0xed,0xed,0x93,0xed,0x3b,0x7e,0xc7,0xd6),
- LL(0xcc,0xcc,0x17,0xcc,0x2e,0xdb,0x85,0xe2),
- LL(0x42,0x42,0x15,0x42,0x2a,0x57,0x84,0x68),
- LL(0x98,0x98,0x5a,0x98,0xb4,0xc2,0x2d,0x2c),
- LL(0xa4,0xa4,0xaa,0xa4,0x49,0x0e,0x55,0xed),
- LL(0x28,0x28,0xa0,0x28,0x5d,0x88,0x50,0x75),
- LL(0x5c,0x5c,0x6d,0x5c,0xda,0x31,0xb8,0x86),
- LL(0xf8,0xf8,0xc7,0xf8,0x93,0x3f,0xed,0x6b),
- LL(0x86,0x86,0x22,0x86,0x44,0xa4,0x11,0xc2),
-#define RC (&(Cx.q[256*N]))
- 0x18,0x23,0xc6,0xe8,0x87,0xb8,0x01,0x4f, /* rc[ROUNDS] */
- 0x36,0xa6,0xd2,0xf5,0x79,0x6f,0x91,0x52,
- 0x60,0xbc,0x9b,0x8e,0xa3,0x0c,0x7b,0x35,
- 0x1d,0xe0,0xd7,0xc2,0x2e,0x4b,0xfe,0x57,
- 0x15,0x77,0x37,0xe5,0x9f,0xf0,0x4a,0xda,
- 0x58,0xc9,0x29,0x0a,0xb1,0xa0,0x6b,0x85,
- 0xbd,0x5d,0x10,0xf4,0xcb,0x3e,0x05,0x67,
- 0xe4,0x27,0x41,0x8b,0xa7,0x7d,0x95,0xd8,
- 0xfb,0xee,0x7c,0x66,0xdd,0x17,0x47,0x9e,
- 0xca,0x2d,0xbf,0x07,0xad,0x5a,0x83,0x33
- }
-};
-
-void whirlpool_block(WHIRLPOOL_CTX *ctx,const void *inp,size_t n)
- {
- int r;
- const u8 *p=inp;
- union { u64 q[8]; u8 c[64]; } S,K,*H=(void *)ctx->H.q;
+ union {
+ u8 c[(256 * N + ROUNDS) * sizeof(u64)];
+ u64 q[(256 * N + ROUNDS)];
+} Cx = {
+ {
+ /* Note endian-neutral representation:-) */
+ LL(0x18, 0x18, 0x60, 0x18, 0xc0, 0x78, 0x30, 0xd8),
+ LL(0x23, 0x23, 0x8c, 0x23, 0x05, 0xaf, 0x46, 0x26),
+ LL(0xc6, 0xc6, 0x3f, 0xc6, 0x7e, 0xf9, 0x91, 0xb8),
+ LL(0xe8, 0xe8, 0x87, 0xe8, 0x13, 0x6f, 0xcd, 0xfb),
+ LL(0x87, 0x87, 0x26, 0x87, 0x4c, 0xa1, 0x13, 0xcb),
+ LL(0xb8, 0xb8, 0xda, 0xb8, 0xa9, 0x62, 0x6d, 0x11),
+ LL(0x01, 0x01, 0x04, 0x01, 0x08, 0x05, 0x02, 0x09),
+ LL(0x4f, 0x4f, 0x21, 0x4f, 0x42, 0x6e, 0x9e, 0x0d),
+ LL(0x36, 0x36, 0xd8, 0x36, 0xad, 0xee, 0x6c, 0x9b),
+ LL(0xa6, 0xa6, 0xa2, 0xa6, 0x59, 0x04, 0x51, 0xff),
+ LL(0xd2, 0xd2, 0x6f, 0xd2, 0xde, 0xbd, 0xb9, 0x0c),
+ LL(0xf5, 0xf5, 0xf3, 0xf5, 0xfb, 0x06, 0xf7, 0x0e),
+ LL(0x79, 0x79, 0xf9, 0x79, 0xef, 0x80, 0xf2, 0x96),
+ LL(0x6f, 0x6f, 0xa1, 0x6f, 0x5f, 0xce, 0xde, 0x30),
+ LL(0x91, 0x91, 0x7e, 0x91, 0xfc, 0xef, 0x3f, 0x6d),
+ LL(0x52, 0x52, 0x55, 0x52, 0xaa, 0x07, 0xa4, 0xf8),
+ LL(0x60, 0x60, 0x9d, 0x60, 0x27, 0xfd, 0xc0, 0x47),
+ LL(0xbc, 0xbc, 0xca, 0xbc, 0x89, 0x76, 0x65, 0x35),
+ LL(0x9b, 0x9b, 0x56, 0x9b, 0xac, 0xcd, 0x2b, 0x37),
+ LL(0x8e, 0x8e, 0x02, 0x8e, 0x04, 0x8c, 0x01, 0x8a),
+ LL(0xa3, 0xa3, 0xb6, 0xa3, 0x71, 0x15, 0x5b, 0xd2),
+ LL(0x0c, 0x0c, 0x30, 0x0c, 0x60, 0x3c, 0x18, 0x6c),
+ LL(0x7b, 0x7b, 0xf1, 0x7b, 0xff, 0x8a, 0xf6, 0x84),
+ LL(0x35, 0x35, 0xd4, 0x35, 0xb5, 0xe1, 0x6a, 0x80),
+ LL(0x1d, 0x1d, 0x74, 0x1d, 0xe8, 0x69, 0x3a, 0xf5),
+ LL(0xe0, 0xe0, 0xa7, 0xe0, 0x53, 0x47, 0xdd, 0xb3),
+ LL(0xd7, 0xd7, 0x7b, 0xd7, 0xf6, 0xac, 0xb3, 0x21),
+ LL(0xc2, 0xc2, 0x2f, 0xc2, 0x5e, 0xed, 0x99, 0x9c),
+ LL(0x2e, 0x2e, 0xb8, 0x2e, 0x6d, 0x96, 0x5c, 0x43),
+ LL(0x4b, 0x4b, 0x31, 0x4b, 0x62, 0x7a, 0x96, 0x29),
+ LL(0xfe, 0xfe, 0xdf, 0xfe, 0xa3, 0x21, 0xe1, 0x5d),
+ LL(0x57, 0x57, 0x41, 0x57, 0x82, 0x16, 0xae, 0xd5),
+ LL(0x15, 0x15, 0x54, 0x15, 0xa8, 0x41, 0x2a, 0xbd),
+ LL(0x77, 0x77, 0xc1, 0x77, 0x9f, 0xb6, 0xee, 0xe8),
+ LL(0x37, 0x37, 0xdc, 0x37, 0xa5, 0xeb, 0x6e, 0x92),
+ LL(0xe5, 0xe5, 0xb3, 0xe5, 0x7b, 0x56, 0xd7, 0x9e),
+ LL(0x9f, 0x9f, 0x46, 0x9f, 0x8c, 0xd9, 0x23, 0x13),
+ LL(0xf0, 0xf0, 0xe7, 0xf0, 0xd3, 0x17, 0xfd, 0x23),
+ LL(0x4a, 0x4a, 0x35, 0x4a, 0x6a, 0x7f, 0x94, 0x20),
+ LL(0xda, 0xda, 0x4f, 0xda, 0x9e, 0x95, 0xa9, 0x44),
+ LL(0x58, 0x58, 0x7d, 0x58, 0xfa, 0x25, 0xb0, 0xa2),
+ LL(0xc9, 0xc9, 0x03, 0xc9, 0x06, 0xca, 0x8f, 0xcf),
+ LL(0x29, 0x29, 0xa4, 0x29, 0x55, 0x8d, 0x52, 0x7c),
+ LL(0x0a, 0x0a, 0x28, 0x0a, 0x50, 0x22, 0x14, 0x5a),
+ LL(0xb1, 0xb1, 0xfe, 0xb1, 0xe1, 0x4f, 0x7f, 0x50),
+ LL(0xa0, 0xa0, 0xba, 0xa0, 0x69, 0x1a, 0x5d, 0xc9),
+ LL(0x6b, 0x6b, 0xb1, 0x6b, 0x7f, 0xda, 0xd6, 0x14),
+ LL(0x85, 0x85, 0x2e, 0x85, 0x5c, 0xab, 0x17, 0xd9),
+ LL(0xbd, 0xbd, 0xce, 0xbd, 0x81, 0x73, 0x67, 0x3c),
+ LL(0x5d, 0x5d, 0x69, 0x5d, 0xd2, 0x34, 0xba, 0x8f),
+ LL(0x10, 0x10, 0x40, 0x10, 0x80, 0x50, 0x20, 0x90),
+ LL(0xf4, 0xf4, 0xf7, 0xf4, 0xf3, 0x03, 0xf5, 0x07),
+ LL(0xcb, 0xcb, 0x0b, 0xcb, 0x16, 0xc0, 0x8b, 0xdd),
+ LL(0x3e, 0x3e, 0xf8, 0x3e, 0xed, 0xc6, 0x7c, 0xd3),
+ LL(0x05, 0x05, 0x14, 0x05, 0x28, 0x11, 0x0a, 0x2d),
+ LL(0x67, 0x67, 0x81, 0x67, 0x1f, 0xe6, 0xce, 0x78),
+ LL(0xe4, 0xe4, 0xb7, 0xe4, 0x73, 0x53, 0xd5, 0x97),
+ LL(0x27, 0x27, 0x9c, 0x27, 0x25, 0xbb, 0x4e, 0x02),
+ LL(0x41, 0x41, 0x19, 0x41, 0x32, 0x58, 0x82, 0x73),
+ LL(0x8b, 0x8b, 0x16, 0x8b, 0x2c, 0x9d, 0x0b, 0xa7),
+ LL(0xa7, 0xa7, 0xa6, 0xa7, 0x51, 0x01, 0x53, 0xf6),
+ LL(0x7d, 0x7d, 0xe9, 0x7d, 0xcf, 0x94, 0xfa, 0xb2),
+ LL(0x95, 0x95, 0x6e, 0x95, 0xdc, 0xfb, 0x37, 0x49),
+ LL(0xd8, 0xd8, 0x47, 0xd8, 0x8e, 0x9f, 0xad, 0x56),
+ LL(0xfb, 0xfb, 0xcb, 0xfb, 0x8b, 0x30, 0xeb, 0x70),
+ LL(0xee, 0xee, 0x9f, 0xee, 0x23, 0x71, 0xc1, 0xcd),
+ LL(0x7c, 0x7c, 0xed, 0x7c, 0xc7, 0x91, 0xf8, 0xbb),
+ LL(0x66, 0x66, 0x85, 0x66, 0x17, 0xe3, 0xcc, 0x71),
+ LL(0xdd, 0xdd, 0x53, 0xdd, 0xa6, 0x8e, 0xa7, 0x7b),
+ LL(0x17, 0x17, 0x5c, 0x17, 0xb8, 0x4b, 0x2e, 0xaf),
+ LL(0x47, 0x47, 0x01, 0x47, 0x02, 0x46, 0x8e, 0x45),
+ LL(0x9e, 0x9e, 0x42, 0x9e, 0x84, 0xdc, 0x21, 0x1a),
+ LL(0xca, 0xca, 0x0f, 0xca, 0x1e, 0xc5, 0x89, 0xd4),
+ LL(0x2d, 0x2d, 0xb4, 0x2d, 0x75, 0x99, 0x5a, 0x58),
+ LL(0xbf, 0xbf, 0xc6, 0xbf, 0x91, 0x79, 0x63, 0x2e),
+ LL(0x07, 0x07, 0x1c, 0x07, 0x38, 0x1b, 0x0e, 0x3f),
+ LL(0xad, 0xad, 0x8e, 0xad, 0x01, 0x23, 0x47, 0xac),
+ LL(0x5a, 0x5a, 0x75, 0x5a, 0xea, 0x2f, 0xb4, 0xb0),
+ LL(0x83, 0x83, 0x36, 0x83, 0x6c, 0xb5, 0x1b, 0xef),
+ LL(0x33, 0x33, 0xcc, 0x33, 0x85, 0xff, 0x66, 0xb6),
+ LL(0x63, 0x63, 0x91, 0x63, 0x3f, 0xf2, 0xc6, 0x5c),
+ LL(0x02, 0x02, 0x08, 0x02, 0x10, 0x0a, 0x04, 0x12),
+ LL(0xaa, 0xaa, 0x92, 0xaa, 0x39, 0x38, 0x49, 0x93),
+ LL(0x71, 0x71, 0xd9, 0x71, 0xaf, 0xa8, 0xe2, 0xde),
+ LL(0xc8, 0xc8, 0x07, 0xc8, 0x0e, 0xcf, 0x8d, 0xc6),
+ LL(0x19, 0x19, 0x64, 0x19, 0xc8, 0x7d, 0x32, 0xd1),
+ LL(0x49, 0x49, 0x39, 0x49, 0x72, 0x70, 0x92, 0x3b),
+ LL(0xd9, 0xd9, 0x43, 0xd9, 0x86, 0x9a, 0xaf, 0x5f),
+ LL(0xf2, 0xf2, 0xef, 0xf2, 0xc3, 0x1d, 0xf9, 0x31),
+ LL(0xe3, 0xe3, 0xab, 0xe3, 0x4b, 0x48, 0xdb, 0xa8),
+ LL(0x5b, 0x5b, 0x71, 0x5b, 0xe2, 0x2a, 0xb6, 0xb9),
+ LL(0x88, 0x88, 0x1a, 0x88, 0x34, 0x92, 0x0d, 0xbc),
+ LL(0x9a, 0x9a, 0x52, 0x9a, 0xa4, 0xc8, 0x29, 0x3e),
+ LL(0x26, 0x26, 0x98, 0x26, 0x2d, 0xbe, 0x4c, 0x0b),
+ LL(0x32, 0x32, 0xc8, 0x32, 0x8d, 0xfa, 0x64, 0xbf),
+ LL(0xb0, 0xb0, 0xfa, 0xb0, 0xe9, 0x4a, 0x7d, 0x59),
+ LL(0xe9, 0xe9, 0x83, 0xe9, 0x1b, 0x6a, 0xcf, 0xf2),
+ LL(0x0f, 0x0f, 0x3c, 0x0f, 0x78, 0x33, 0x1e, 0x77),
+ LL(0xd5, 0xd5, 0x73, 0xd5, 0xe6, 0xa6, 0xb7, 0x33),
+ LL(0x80, 0x80, 0x3a, 0x80, 0x74, 0xba, 0x1d, 0xf4),
+ LL(0xbe, 0xbe, 0xc2, 0xbe, 0x99, 0x7c, 0x61, 0x27),
+ LL(0xcd, 0xcd, 0x13, 0xcd, 0x26, 0xde, 0x87, 0xeb),
+ LL(0x34, 0x34, 0xd0, 0x34, 0xbd, 0xe4, 0x68, 0x89),
+ LL(0x48, 0x48, 0x3d, 0x48, 0x7a, 0x75, 0x90, 0x32),
+ LL(0xff, 0xff, 0xdb, 0xff, 0xab, 0x24, 0xe3, 0x54),
+ LL(0x7a, 0x7a, 0xf5, 0x7a, 0xf7, 0x8f, 0xf4, 0x8d),
+ LL(0x90, 0x90, 0x7a, 0x90, 0xf4, 0xea, 0x3d, 0x64),
+ LL(0x5f, 0x5f, 0x61, 0x5f, 0xc2, 0x3e, 0xbe, 0x9d),
+ LL(0x20, 0x20, 0x80, 0x20, 0x1d, 0xa0, 0x40, 0x3d),
+ LL(0x68, 0x68, 0xbd, 0x68, 0x67, 0xd5, 0xd0, 0x0f),
+ LL(0x1a, 0x1a, 0x68, 0x1a, 0xd0, 0x72, 0x34, 0xca),
+ LL(0xae, 0xae, 0x82, 0xae, 0x19, 0x2c, 0x41, 0xb7),
+ LL(0xb4, 0xb4, 0xea, 0xb4, 0xc9, 0x5e, 0x75, 0x7d),
+ LL(0x54, 0x54, 0x4d, 0x54, 0x9a, 0x19, 0xa8, 0xce),
+ LL(0x93, 0x93, 0x76, 0x93, 0xec, 0xe5, 0x3b, 0x7f),
+ LL(0x22, 0x22, 0x88, 0x22, 0x0d, 0xaa, 0x44, 0x2f),
+ LL(0x64, 0x64, 0x8d, 0x64, 0x07, 0xe9, 0xc8, 0x63),
+ LL(0xf1, 0xf1, 0xe3, 0xf1, 0xdb, 0x12, 0xff, 0x2a),
+ LL(0x73, 0x73, 0xd1, 0x73, 0xbf, 0xa2, 0xe6, 0xcc),
+ LL(0x12, 0x12, 0x48, 0x12, 0x90, 0x5a, 0x24, 0x82),
+ LL(0x40, 0x40, 0x1d, 0x40, 0x3a, 0x5d, 0x80, 0x7a),
+ LL(0x08, 0x08, 0x20, 0x08, 0x40, 0x28, 0x10, 0x48),
+ LL(0xc3, 0xc3, 0x2b, 0xc3, 0x56, 0xe8, 0x9b, 0x95),
+ LL(0xec, 0xec, 0x97, 0xec, 0x33, 0x7b, 0xc5, 0xdf),
+ LL(0xdb, 0xdb, 0x4b, 0xdb, 0x96, 0x90, 0xab, 0x4d),
+ LL(0xa1, 0xa1, 0xbe, 0xa1, 0x61, 0x1f, 0x5f, 0xc0),
+ LL(0x8d, 0x8d, 0x0e, 0x8d, 0x1c, 0x83, 0x07, 0x91),
+ LL(0x3d, 0x3d, 0xf4, 0x3d, 0xf5, 0xc9, 0x7a, 0xc8),
+ LL(0x97, 0x97, 0x66, 0x97, 0xcc, 0xf1, 0x33, 0x5b),
+ LL(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+ LL(0xcf, 0xcf, 0x1b, 0xcf, 0x36, 0xd4, 0x83, 0xf9),
+ LL(0x2b, 0x2b, 0xac, 0x2b, 0x45, 0x87, 0x56, 0x6e),
+ LL(0x76, 0x76, 0xc5, 0x76, 0x97, 0xb3, 0xec, 0xe1),
+ LL(0x82, 0x82, 0x32, 0x82, 0x64, 0xb0, 0x19, 0xe6),
+ LL(0xd6, 0xd6, 0x7f, 0xd6, 0xfe, 0xa9, 0xb1, 0x28),
+ LL(0x1b, 0x1b, 0x6c, 0x1b, 0xd8, 0x77, 0x36, 0xc3),
+ LL(0xb5, 0xb5, 0xee, 0xb5, 0xc1, 0x5b, 0x77, 0x74),
+ LL(0xaf, 0xaf, 0x86, 0xaf, 0x11, 0x29, 0x43, 0xbe),
+ LL(0x6a, 0x6a, 0xb5, 0x6a, 0x77, 0xdf, 0xd4, 0x1d),
+ LL(0x50, 0x50, 0x5d, 0x50, 0xba, 0x0d, 0xa0, 0xea),
+ LL(0x45, 0x45, 0x09, 0x45, 0x12, 0x4c, 0x8a, 0x57),
+ LL(0xf3, 0xf3, 0xeb, 0xf3, 0xcb, 0x18, 0xfb, 0x38),
+ LL(0x30, 0x30, 0xc0, 0x30, 0x9d, 0xf0, 0x60, 0xad),
+ LL(0xef, 0xef, 0x9b, 0xef, 0x2b, 0x74, 0xc3, 0xc4),
+ LL(0x3f, 0x3f, 0xfc, 0x3f, 0xe5, 0xc3, 0x7e, 0xda),
+ LL(0x55, 0x55, 0x49, 0x55, 0x92, 0x1c, 0xaa, 0xc7),
+ LL(0xa2, 0xa2, 0xb2, 0xa2, 0x79, 0x10, 0x59, 0xdb),
+ LL(0xea, 0xea, 0x8f, 0xea, 0x03, 0x65, 0xc9, 0xe9),
+ LL(0x65, 0x65, 0x89, 0x65, 0x0f, 0xec, 0xca, 0x6a),
+ LL(0xba, 0xba, 0xd2, 0xba, 0xb9, 0x68, 0x69, 0x03),
+ LL(0x2f, 0x2f, 0xbc, 0x2f, 0x65, 0x93, 0x5e, 0x4a),
+ LL(0xc0, 0xc0, 0x27, 0xc0, 0x4e, 0xe7, 0x9d, 0x8e),
+ LL(0xde, 0xde, 0x5f, 0xde, 0xbe, 0x81, 0xa1, 0x60),
+ LL(0x1c, 0x1c, 0x70, 0x1c, 0xe0, 0x6c, 0x38, 0xfc),
+ LL(0xfd, 0xfd, 0xd3, 0xfd, 0xbb, 0x2e, 0xe7, 0x46),
+ LL(0x4d, 0x4d, 0x29, 0x4d, 0x52, 0x64, 0x9a, 0x1f),
+ LL(0x92, 0x92, 0x72, 0x92, 0xe4, 0xe0, 0x39, 0x76),
+ LL(0x75, 0x75, 0xc9, 0x75, 0x8f, 0xbc, 0xea, 0xfa),
+ LL(0x06, 0x06, 0x18, 0x06, 0x30, 0x1e, 0x0c, 0x36),
+ LL(0x8a, 0x8a, 0x12, 0x8a, 0x24, 0x98, 0x09, 0xae),
+ LL(0xb2, 0xb2, 0xf2, 0xb2, 0xf9, 0x40, 0x79, 0x4b),
+ LL(0xe6, 0xe6, 0xbf, 0xe6, 0x63, 0x59, 0xd1, 0x85),
+ LL(0x0e, 0x0e, 0x38, 0x0e, 0x70, 0x36, 0x1c, 0x7e),
+ LL(0x1f, 0x1f, 0x7c, 0x1f, 0xf8, 0x63, 0x3e, 0xe7),
+ LL(0x62, 0x62, 0x95, 0x62, 0x37, 0xf7, 0xc4, 0x55),
+ LL(0xd4, 0xd4, 0x77, 0xd4, 0xee, 0xa3, 0xb5, 0x3a),
+ LL(0xa8, 0xa8, 0x9a, 0xa8, 0x29, 0x32, 0x4d, 0x81),
+ LL(0x96, 0x96, 0x62, 0x96, 0xc4, 0xf4, 0x31, 0x52),
+ LL(0xf9, 0xf9, 0xc3, 0xf9, 0x9b, 0x3a, 0xef, 0x62),
+ LL(0xc5, 0xc5, 0x33, 0xc5, 0x66, 0xf6, 0x97, 0xa3),
+ LL(0x25, 0x25, 0x94, 0x25, 0x35, 0xb1, 0x4a, 0x10),
+ LL(0x59, 0x59, 0x79, 0x59, 0xf2, 0x20, 0xb2, 0xab),
+ LL(0x84, 0x84, 0x2a, 0x84, 0x54, 0xae, 0x15, 0xd0),
+ LL(0x72, 0x72, 0xd5, 0x72, 0xb7, 0xa7, 0xe4, 0xc5),
+ LL(0x39, 0x39, 0xe4, 0x39, 0xd5, 0xdd, 0x72, 0xec),
+ LL(0x4c, 0x4c, 0x2d, 0x4c, 0x5a, 0x61, 0x98, 0x16),
+ LL(0x5e, 0x5e, 0x65, 0x5e, 0xca, 0x3b, 0xbc, 0x94),
+ LL(0x78, 0x78, 0xfd, 0x78, 0xe7, 0x85, 0xf0, 0x9f),
+ LL(0x38, 0x38, 0xe0, 0x38, 0xdd, 0xd8, 0x70, 0xe5),
+ LL(0x8c, 0x8c, 0x0a, 0x8c, 0x14, 0x86, 0x05, 0x98),
+ LL(0xd1, 0xd1, 0x63, 0xd1, 0xc6, 0xb2, 0xbf, 0x17),
+ LL(0xa5, 0xa5, 0xae, 0xa5, 0x41, 0x0b, 0x57, 0xe4),
+ LL(0xe2, 0xe2, 0xaf, 0xe2, 0x43, 0x4d, 0xd9, 0xa1),
+ LL(0x61, 0x61, 0x99, 0x61, 0x2f, 0xf8, 0xc2, 0x4e),
+ LL(0xb3, 0xb3, 0xf6, 0xb3, 0xf1, 0x45, 0x7b, 0x42),
+ LL(0x21, 0x21, 0x84, 0x21, 0x15, 0xa5, 0x42, 0x34),
+ LL(0x9c, 0x9c, 0x4a, 0x9c, 0x94, 0xd6, 0x25, 0x08),
+ LL(0x1e, 0x1e, 0x78, 0x1e, 0xf0, 0x66, 0x3c, 0xee),
+ LL(0x43, 0x43, 0x11, 0x43, 0x22, 0x52, 0x86, 0x61),
+ LL(0xc7, 0xc7, 0x3b, 0xc7, 0x76, 0xfc, 0x93, 0xb1),
+ LL(0xfc, 0xfc, 0xd7, 0xfc, 0xb3, 0x2b, 0xe5, 0x4f),
+ LL(0x04, 0x04, 0x10, 0x04, 0x20, 0x14, 0x08, 0x24),
+ LL(0x51, 0x51, 0x59, 0x51, 0xb2, 0x08, 0xa2, 0xe3),
+ LL(0x99, 0x99, 0x5e, 0x99, 0xbc, 0xc7, 0x2f, 0x25),
+ LL(0x6d, 0x6d, 0xa9, 0x6d, 0x4f, 0xc4, 0xda, 0x22),
+ LL(0x0d, 0x0d, 0x34, 0x0d, 0x68, 0x39, 0x1a, 0x65),
+ LL(0xfa, 0xfa, 0xcf, 0xfa, 0x83, 0x35, 0xe9, 0x79),
+ LL(0xdf, 0xdf, 0x5b, 0xdf, 0xb6, 0x84, 0xa3, 0x69),
+ LL(0x7e, 0x7e, 0xe5, 0x7e, 0xd7, 0x9b, 0xfc, 0xa9),
+ LL(0x24, 0x24, 0x90, 0x24, 0x3d, 0xb4, 0x48, 0x19),
+ LL(0x3b, 0x3b, 0xec, 0x3b, 0xc5, 0xd7, 0x76, 0xfe),
+ LL(0xab, 0xab, 0x96, 0xab, 0x31, 0x3d, 0x4b, 0x9a),
+ LL(0xce, 0xce, 0x1f, 0xce, 0x3e, 0xd1, 0x81, 0xf0),
+ LL(0x11, 0x11, 0x44, 0x11, 0x88, 0x55, 0x22, 0x99),
+ LL(0x8f, 0x8f, 0x06, 0x8f, 0x0c, 0x89, 0x03, 0x83),
+ LL(0x4e, 0x4e, 0x25, 0x4e, 0x4a, 0x6b, 0x9c, 0x04),
+ LL(0xb7, 0xb7, 0xe6, 0xb7, 0xd1, 0x51, 0x73, 0x66),
+ LL(0xeb, 0xeb, 0x8b, 0xeb, 0x0b, 0x60, 0xcb, 0xe0),
+ LL(0x3c, 0x3c, 0xf0, 0x3c, 0xfd, 0xcc, 0x78, 0xc1),
+ LL(0x81, 0x81, 0x3e, 0x81, 0x7c, 0xbf, 0x1f, 0xfd),
+ LL(0x94, 0x94, 0x6a, 0x94, 0xd4, 0xfe, 0x35, 0x40),
+ LL(0xf7, 0xf7, 0xfb, 0xf7, 0xeb, 0x0c, 0xf3, 0x1c),
+ LL(0xb9, 0xb9, 0xde, 0xb9, 0xa1, 0x67, 0x6f, 0x18),
+ LL(0x13, 0x13, 0x4c, 0x13, 0x98, 0x5f, 0x26, 0x8b),
+ LL(0x2c, 0x2c, 0xb0, 0x2c, 0x7d, 0x9c, 0x58, 0x51),
+ LL(0xd3, 0xd3, 0x6b, 0xd3, 0xd6, 0xb8, 0xbb, 0x05),
+ LL(0xe7, 0xe7, 0xbb, 0xe7, 0x6b, 0x5c, 0xd3, 0x8c),
+ LL(0x6e, 0x6e, 0xa5, 0x6e, 0x57, 0xcb, 0xdc, 0x39),
+ LL(0xc4, 0xc4, 0x37, 0xc4, 0x6e, 0xf3, 0x95, 0xaa),
+ LL(0x03, 0x03, 0x0c, 0x03, 0x18, 0x0f, 0x06, 0x1b),
+ LL(0x56, 0x56, 0x45, 0x56, 0x8a, 0x13, 0xac, 0xdc),
+ LL(0x44, 0x44, 0x0d, 0x44, 0x1a, 0x49, 0x88, 0x5e),
+ LL(0x7f, 0x7f, 0xe1, 0x7f, 0xdf, 0x9e, 0xfe, 0xa0),
+ LL(0xa9, 0xa9, 0x9e, 0xa9, 0x21, 0x37, 0x4f, 0x88),
+ LL(0x2a, 0x2a, 0xa8, 0x2a, 0x4d, 0x82, 0x54, 0x67),
+ LL(0xbb, 0xbb, 0xd6, 0xbb, 0xb1, 0x6d, 0x6b, 0x0a),
+ LL(0xc1, 0xc1, 0x23, 0xc1, 0x46, 0xe2, 0x9f, 0x87),
+ LL(0x53, 0x53, 0x51, 0x53, 0xa2, 0x02, 0xa6, 0xf1),
+ LL(0xdc, 0xdc, 0x57, 0xdc, 0xae, 0x8b, 0xa5, 0x72),
+ LL(0x0b, 0x0b, 0x2c, 0x0b, 0x58, 0x27, 0x16, 0x53),
+ LL(0x9d, 0x9d, 0x4e, 0x9d, 0x9c, 0xd3, 0x27, 0x01),
+ LL(0x6c, 0x6c, 0xad, 0x6c, 0x47, 0xc1, 0xd8, 0x2b),
+ LL(0x31, 0x31, 0xc4, 0x31, 0x95, 0xf5, 0x62, 0xa4),
+ LL(0x74, 0x74, 0xcd, 0x74, 0x87, 0xb9, 0xe8, 0xf3),
+ LL(0xf6, 0xf6, 0xff, 0xf6, 0xe3, 0x09, 0xf1, 0x15),
+ LL(0x46, 0x46, 0x05, 0x46, 0x0a, 0x43, 0x8c, 0x4c),
+ LL(0xac, 0xac, 0x8a, 0xac, 0x09, 0x26, 0x45, 0xa5),
+ LL(0x89, 0x89, 0x1e, 0x89, 0x3c, 0x97, 0x0f, 0xb5),
+ LL(0x14, 0x14, 0x50, 0x14, 0xa0, 0x44, 0x28, 0xb4),
+ LL(0xe1, 0xe1, 0xa3, 0xe1, 0x5b, 0x42, 0xdf, 0xba),
+ LL(0x16, 0x16, 0x58, 0x16, 0xb0, 0x4e, 0x2c, 0xa6),
+ LL(0x3a, 0x3a, 0xe8, 0x3a, 0xcd, 0xd2, 0x74, 0xf7),
+ LL(0x69, 0x69, 0xb9, 0x69, 0x6f, 0xd0, 0xd2, 0x06),
+ LL(0x09, 0x09, 0x24, 0x09, 0x48, 0x2d, 0x12, 0x41),
+ LL(0x70, 0x70, 0xdd, 0x70, 0xa7, 0xad, 0xe0, 0xd7),
+ LL(0xb6, 0xb6, 0xe2, 0xb6, 0xd9, 0x54, 0x71, 0x6f),
+ LL(0xd0, 0xd0, 0x67, 0xd0, 0xce, 0xb7, 0xbd, 0x1e),
+ LL(0xed, 0xed, 0x93, 0xed, 0x3b, 0x7e, 0xc7, 0xd6),
+ LL(0xcc, 0xcc, 0x17, 0xcc, 0x2e, 0xdb, 0x85, 0xe2),
+ LL(0x42, 0x42, 0x15, 0x42, 0x2a, 0x57, 0x84, 0x68),
+ LL(0x98, 0x98, 0x5a, 0x98, 0xb4, 0xc2, 0x2d, 0x2c),
+ LL(0xa4, 0xa4, 0xaa, 0xa4, 0x49, 0x0e, 0x55, 0xed),
+ LL(0x28, 0x28, 0xa0, 0x28, 0x5d, 0x88, 0x50, 0x75),
+ LL(0x5c, 0x5c, 0x6d, 0x5c, 0xda, 0x31, 0xb8, 0x86),
+ LL(0xf8, 0xf8, 0xc7, 0xf8, 0x93, 0x3f, 0xed, 0x6b),
+ LL(0x86, 0x86, 0x22, 0x86, 0x44, 0xa4, 0x11, 0xc2),
+#define RC (&(Cx.q[256*N]))
+ 0x18, 0x23, 0xc6, 0xe8, 0x87, 0xb8, 0x01, 0x4f,
+ /* rc[ROUNDS] */
+ 0x36, 0xa6, 0xd2, 0xf5, 0x79, 0x6f, 0x91, 0x52, 0x60, 0xbc, 0x9b,
+ 0x8e, 0xa3, 0x0c, 0x7b, 0x35, 0x1d, 0xe0, 0xd7, 0xc2, 0x2e, 0x4b,
+ 0xfe, 0x57, 0x15, 0x77, 0x37, 0xe5, 0x9f, 0xf0, 0x4a, 0xda, 0x58,
+ 0xc9, 0x29, 0x0a, 0xb1, 0xa0, 0x6b, 0x85, 0xbd, 0x5d, 0x10, 0xf4,
+ 0xcb, 0x3e, 0x05, 0x67, 0xe4, 0x27, 0x41, 0x8b, 0xa7, 0x7d, 0x95,
+ 0xd8, 0xfb, 0xee, 0x7c, 0x66, 0xdd, 0x17, 0x47, 0x9e, 0xca, 0x2d,
+ 0xbf, 0x07, 0xad, 0x5a, 0x83, 0x33
+ }
+ };
+
+void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
+{
+ int r;
+ const u8 *p = inp;
+ union {
+ u64 q[8];
+ u8 c[64];
+ } S, K, *H = (void *)ctx->H.q;
#ifdef GO_FOR_MMX
- GO_FOR_MMX(ctx,inp,n);
+ GO_FOR_MMX(ctx, inp, n);
#endif
- do {
+ do {
#ifdef OPENSSL_SMALL_FOOTPRINT
- u64 L[8];
- int i;
-
- for (i=0;i<64;i++) S.c[i] = (K.c[i] = H->c[i]) ^ p[i];
- for (r=0;r<ROUNDS;r++)
- {
- for (i=0;i<8;i++)
- {
- L[i] = i ? 0 : RC[r];
- L[i] ^= C0(K,i) ^ C1(K,(i-1)&7) ^
- C2(K,(i-2)&7) ^ C3(K,(i-3)&7) ^
- C4(K,(i-4)&7) ^ C5(K,(i-5)&7) ^
- C6(K,(i-6)&7) ^ C7(K,(i-7)&7);
- }
- memcpy (K.q,L,64);
- for (i=0;i<8;i++)
- {
- L[i] ^= C0(S,i) ^ C1(S,(i-1)&7) ^
- C2(S,(i-2)&7) ^ C3(S,(i-3)&7) ^
- C4(S,(i-4)&7) ^ C5(S,(i-5)&7) ^
- C6(S,(i-6)&7) ^ C7(S,(i-7)&7);
- }
- memcpy (S.q,L,64);
- }
- for (i=0;i<64;i++) H->c[i] ^= S.c[i] ^ p[i];
+ u64 L[8];
+ int i;
+
+ for (i = 0; i < 64; i++)
+ S.c[i] = (K.c[i] = H->c[i]) ^ p[i];
+ for (r = 0; r < ROUNDS; r++) {
+ for (i = 0; i < 8; i++) {
+ L[i] = i ? 0 : RC[r];
+ L[i] ^= C0(K, i) ^ C1(K, (i - 1) & 7) ^
+ C2(K, (i - 2) & 7) ^ C3(K, (i - 3) & 7) ^
+ C4(K, (i - 4) & 7) ^ C5(K, (i - 5) & 7) ^
+ C6(K, (i - 6) & 7) ^ C7(K, (i - 7) & 7);
+ }
+ memcpy(K.q, L, 64);
+ for (i = 0; i < 8; i++) {
+ L[i] ^= C0(S, i) ^ C1(S, (i - 1) & 7) ^
+ C2(S, (i - 2) & 7) ^ C3(S, (i - 3) & 7) ^
+ C4(S, (i - 4) & 7) ^ C5(S, (i - 5) & 7) ^
+ C6(S, (i - 6) & 7) ^ C7(S, (i - 7) & 7);
+ }
+ memcpy(S.q, L, 64);
+ }
+ for (i = 0; i < 64; i++)
+ H->c[i] ^= S.c[i] ^ p[i];
#else
- u64 L0,L1,L2,L3,L4,L5,L6,L7;
-
-#ifdef STRICT_ALIGNMENT
- if ((size_t)p & 7)
- {
- memcpy (S.c,p,64);
- S.q[0] ^= (K.q[0] = H->q[0]);
- S.q[1] ^= (K.q[1] = H->q[1]);
- S.q[2] ^= (K.q[2] = H->q[2]);
- S.q[3] ^= (K.q[3] = H->q[3]);
- S.q[4] ^= (K.q[4] = H->q[4]);
- S.q[5] ^= (K.q[5] = H->q[5]);
- S.q[6] ^= (K.q[6] = H->q[6]);
- S.q[7] ^= (K.q[7] = H->q[7]);
- }
- else
-#endif
- {
- const u64 *pa = (const u64*)p;
- S.q[0] = (K.q[0] = H->q[0]) ^ pa[0];
- S.q[1] = (K.q[1] = H->q[1]) ^ pa[1];
- S.q[2] = (K.q[2] = H->q[2]) ^ pa[2];
- S.q[3] = (K.q[3] = H->q[3]) ^ pa[3];
- S.q[4] = (K.q[4] = H->q[4]) ^ pa[4];
- S.q[5] = (K.q[5] = H->q[5]) ^ pa[5];
- S.q[6] = (K.q[6] = H->q[6]) ^ pa[6];
- S.q[7] = (K.q[7] = H->q[7]) ^ pa[7];
- }
-
- for(r=0;r<ROUNDS;r++)
- {
-#ifdef SMALL_REGISTER_BANK
- L0 = C0(K,0) ^ C1(K,7) ^ C2(K,6) ^ C3(K,5) ^
- C4(K,4) ^ C5(K,3) ^ C6(K,2) ^ C7(K,1) ^ RC[r];
- L1 = C0(K,1) ^ C1(K,0) ^ C2(K,7) ^ C3(K,6) ^
- C4(K,5) ^ C5(K,4) ^ C6(K,3) ^ C7(K,2);
- L2 = C0(K,2) ^ C1(K,1) ^ C2(K,0) ^ C3(K,7) ^
- C4(K,6) ^ C5(K,5) ^ C6(K,4) ^ C7(K,3);
- L3 = C0(K,3) ^ C1(K,2) ^ C2(K,1) ^ C3(K,0) ^
- C4(K,7) ^ C5(K,6) ^ C6(K,5) ^ C7(K,4);
- L4 = C0(K,4) ^ C1(K,3) ^ C2(K,2) ^ C3(K,1) ^
- C4(K,0) ^ C5(K,7) ^ C6(K,6) ^ C7(K,5);
- L5 = C0(K,5) ^ C1(K,4) ^ C2(K,3) ^ C3(K,2) ^
- C4(K,1) ^ C5(K,0) ^ C6(K,7) ^ C7(K,6);
- L6 = C0(K,6) ^ C1(K,5) ^ C2(K,4) ^ C3(K,3) ^
- C4(K,2) ^ C5(K,1) ^ C6(K,0) ^ C7(K,7);
- L7 = C0(K,7) ^ C1(K,6) ^ C2(K,5) ^ C3(K,4) ^
- C4(K,3) ^ C5(K,2) ^ C6(K,1) ^ C7(K,0);
-
- K.q[0] = L0; K.q[1] = L1; K.q[2] = L2; K.q[3] = L3;
- K.q[4] = L4; K.q[5] = L5; K.q[6] = L6; K.q[7] = L7;
-
- L0 ^= C0(S,0) ^ C1(S,7) ^ C2(S,6) ^ C3(S,5) ^
- C4(S,4) ^ C5(S,3) ^ C6(S,2) ^ C7(S,1);
- L1 ^= C0(S,1) ^ C1(S,0) ^ C2(S,7) ^ C3(S,6) ^
- C4(S,5) ^ C5(S,4) ^ C6(S,3) ^ C7(S,2);
- L2 ^= C0(S,2) ^ C1(S,1) ^ C2(S,0) ^ C3(S,7) ^
- C4(S,6) ^ C5(S,5) ^ C6(S,4) ^ C7(S,3);
- L3 ^= C0(S,3) ^ C1(S,2) ^ C2(S,1) ^ C3(S,0) ^
- C4(S,7) ^ C5(S,6) ^ C6(S,5) ^ C7(S,4);
- L4 ^= C0(S,4) ^ C1(S,3) ^ C2(S,2) ^ C3(S,1) ^
- C4(S,0) ^ C5(S,7) ^ C6(S,6) ^ C7(S,5);
- L5 ^= C0(S,5) ^ C1(S,4) ^ C2(S,3) ^ C3(S,2) ^
- C4(S,1) ^ C5(S,0) ^ C6(S,7) ^ C7(S,6);
- L6 ^= C0(S,6) ^ C1(S,5) ^ C2(S,4) ^ C3(S,3) ^
- C4(S,2) ^ C5(S,1) ^ C6(S,0) ^ C7(S,7);
- L7 ^= C0(S,7) ^ C1(S,6) ^ C2(S,5) ^ C3(S,4) ^
- C4(S,3) ^ C5(S,2) ^ C6(S,1) ^ C7(S,0);
-
- S.q[0] = L0; S.q[1] = L1; S.q[2] = L2; S.q[3] = L3;
- S.q[4] = L4; S.q[5] = L5; S.q[6] = L6; S.q[7] = L7;
-#else
- L0 = C0(K,0); L1 = C1(K,0); L2 = C2(K,0); L3 = C3(K,0);
- L4 = C4(K,0); L5 = C5(K,0); L6 = C6(K,0); L7 = C7(K,0);
- L0 ^= RC[r];
-
- L1 ^= C0(K,1); L2 ^= C1(K,1); L3 ^= C2(K,1); L4 ^= C3(K,1);
- L5 ^= C4(K,1); L6 ^= C5(K,1); L7 ^= C6(K,1); L0 ^= C7(K,1);
-
- L2 ^= C0(K,2); L3 ^= C1(K,2); L4 ^= C2(K,2); L5 ^= C3(K,2);
- L6 ^= C4(K,2); L7 ^= C5(K,2); L0 ^= C6(K,2); L1 ^= C7(K,2);
-
- L3 ^= C0(K,3); L4 ^= C1(K,3); L5 ^= C2(K,3); L6 ^= C3(K,3);
- L7 ^= C4(K,3); L0 ^= C5(K,3); L1 ^= C6(K,3); L2 ^= C7(K,3);
-
- L4 ^= C0(K,4); L5 ^= C1(K,4); L6 ^= C2(K,4); L7 ^= C3(K,4);
- L0 ^= C4(K,4); L1 ^= C5(K,4); L2 ^= C6(K,4); L3 ^= C7(K,4);
-
- L5 ^= C0(K,5); L6 ^= C1(K,5); L7 ^= C2(K,5); L0 ^= C3(K,5);
- L1 ^= C4(K,5); L2 ^= C5(K,5); L3 ^= C6(K,5); L4 ^= C7(K,5);
-
- L6 ^= C0(K,6); L7 ^= C1(K,6); L0 ^= C2(K,6); L1 ^= C3(K,6);
- L2 ^= C4(K,6); L3 ^= C5(K,6); L4 ^= C6(K,6); L5 ^= C7(K,6);
-
- L7 ^= C0(K,7); L0 ^= C1(K,7); L1 ^= C2(K,7); L2 ^= C3(K,7);
- L3 ^= C4(K,7); L4 ^= C5(K,7); L5 ^= C6(K,7); L6 ^= C7(K,7);
-
- K.q[0] = L0; K.q[1] = L1; K.q[2] = L2; K.q[3] = L3;
- K.q[4] = L4; K.q[5] = L5; K.q[6] = L6; K.q[7] = L7;
-
- L0 ^= C0(S,0); L1 ^= C1(S,0); L2 ^= C2(S,0); L3 ^= C3(S,0);
- L4 ^= C4(S,0); L5 ^= C5(S,0); L6 ^= C6(S,0); L7 ^= C7(S,0);
-
- L1 ^= C0(S,1); L2 ^= C1(S,1); L3 ^= C2(S,1); L4 ^= C3(S,1);
- L5 ^= C4(S,1); L6 ^= C5(S,1); L7 ^= C6(S,1); L0 ^= C7(S,1);
-
- L2 ^= C0(S,2); L3 ^= C1(S,2); L4 ^= C2(S,2); L5 ^= C3(S,2);
- L6 ^= C4(S,2); L7 ^= C5(S,2); L0 ^= C6(S,2); L1 ^= C7(S,2);
-
- L3 ^= C0(S,3); L4 ^= C1(S,3); L5 ^= C2(S,3); L6 ^= C3(S,3);
- L7 ^= C4(S,3); L0 ^= C5(S,3); L1 ^= C6(S,3); L2 ^= C7(S,3);
-
- L4 ^= C0(S,4); L5 ^= C1(S,4); L6 ^= C2(S,4); L7 ^= C3(S,4);
- L0 ^= C4(S,4); L1 ^= C5(S,4); L2 ^= C6(S,4); L3 ^= C7(S,4);
-
- L5 ^= C0(S,5); L6 ^= C1(S,5); L7 ^= C2(S,5); L0 ^= C3(S,5);
- L1 ^= C4(S,5); L2 ^= C5(S,5); L3 ^= C6(S,5); L4 ^= C7(S,5);
-
- L6 ^= C0(S,6); L7 ^= C1(S,6); L0 ^= C2(S,6); L1 ^= C3(S,6);
- L2 ^= C4(S,6); L3 ^= C5(S,6); L4 ^= C6(S,6); L5 ^= C7(S,6);
-
- L7 ^= C0(S,7); L0 ^= C1(S,7); L1 ^= C2(S,7); L2 ^= C3(S,7);
- L3 ^= C4(S,7); L4 ^= C5(S,7); L5 ^= C6(S,7); L6 ^= C7(S,7);
-
- S.q[0] = L0; S.q[1] = L1; S.q[2] = L2; S.q[3] = L3;
- S.q[4] = L4; S.q[5] = L5; S.q[6] = L6; S.q[7] = L7;
-#endif
- }
-
-#ifdef STRICT_ALIGNMENT
- if ((size_t)p & 7)
- {
- int i;
- for(i=0;i<64;i++) H->c[i] ^= S.c[i] ^ p[i];
- }
- else
-#endif
- {
- const u64 *pa=(const u64 *)p;
- H->q[0] ^= S.q[0] ^ pa[0];
- H->q[1] ^= S.q[1] ^ pa[1];
- H->q[2] ^= S.q[2] ^ pa[2];
- H->q[3] ^= S.q[3] ^ pa[3];
- H->q[4] ^= S.q[4] ^ pa[4];
- H->q[5] ^= S.q[5] ^ pa[5];
- H->q[6] ^= S.q[6] ^ pa[6];
- H->q[7] ^= S.q[7] ^ pa[7];
- }
+ u64 L0, L1, L2, L3, L4, L5, L6, L7;
+
+# ifdef STRICT_ALIGNMENT
+ if ((size_t)p & 7) {
+ memcpy(S.c, p, 64);
+ S.q[0] ^= (K.q[0] = H->q[0]);
+ S.q[1] ^= (K.q[1] = H->q[1]);
+ S.q[2] ^= (K.q[2] = H->q[2]);
+ S.q[3] ^= (K.q[3] = H->q[3]);
+ S.q[4] ^= (K.q[4] = H->q[4]);
+ S.q[5] ^= (K.q[5] = H->q[5]);
+ S.q[6] ^= (K.q[6] = H->q[6]);
+ S.q[7] ^= (K.q[7] = H->q[7]);
+ } else
+# endif
+ {
+ const u64 *pa = (const u64 *)p;
+ S.q[0] = (K.q[0] = H->q[0]) ^ pa[0];
+ S.q[1] = (K.q[1] = H->q[1]) ^ pa[1];
+ S.q[2] = (K.q[2] = H->q[2]) ^ pa[2];
+ S.q[3] = (K.q[3] = H->q[3]) ^ pa[3];
+ S.q[4] = (K.q[4] = H->q[4]) ^ pa[4];
+ S.q[5] = (K.q[5] = H->q[5]) ^ pa[5];
+ S.q[6] = (K.q[6] = H->q[6]) ^ pa[6];
+ S.q[7] = (K.q[7] = H->q[7]) ^ pa[7];
+ }
+
+ for (r = 0; r < ROUNDS; r++) {
+# ifdef SMALL_REGISTER_BANK
+ L0 = C0(K, 0) ^ C1(K, 7) ^ C2(K, 6) ^ C3(K, 5) ^
+ C4(K, 4) ^ C5(K, 3) ^ C6(K, 2) ^ C7(K, 1) ^ RC[r];
+ L1 = C0(K, 1) ^ C1(K, 0) ^ C2(K, 7) ^ C3(K, 6) ^
+ C4(K, 5) ^ C5(K, 4) ^ C6(K, 3) ^ C7(K, 2);
+ L2 = C0(K, 2) ^ C1(K, 1) ^ C2(K, 0) ^ C3(K, 7) ^
+ C4(K, 6) ^ C5(K, 5) ^ C6(K, 4) ^ C7(K, 3);
+ L3 = C0(K, 3) ^ C1(K, 2) ^ C2(K, 1) ^ C3(K, 0) ^
+ C4(K, 7) ^ C5(K, 6) ^ C6(K, 5) ^ C7(K, 4);
+ L4 = C0(K, 4) ^ C1(K, 3) ^ C2(K, 2) ^ C3(K, 1) ^
+ C4(K, 0) ^ C5(K, 7) ^ C6(K, 6) ^ C7(K, 5);
+ L5 = C0(K, 5) ^ C1(K, 4) ^ C2(K, 3) ^ C3(K, 2) ^
+ C4(K, 1) ^ C5(K, 0) ^ C6(K, 7) ^ C7(K, 6);
+ L6 = C0(K, 6) ^ C1(K, 5) ^ C2(K, 4) ^ C3(K, 3) ^
+ C4(K, 2) ^ C5(K, 1) ^ C6(K, 0) ^ C7(K, 7);
+ L7 = C0(K, 7) ^ C1(K, 6) ^ C2(K, 5) ^ C3(K, 4) ^
+ C4(K, 3) ^ C5(K, 2) ^ C6(K, 1) ^ C7(K, 0);
+
+ K.q[0] = L0;
+ K.q[1] = L1;
+ K.q[2] = L2;
+ K.q[3] = L3;
+ K.q[4] = L4;
+ K.q[5] = L5;
+ K.q[6] = L6;
+ K.q[7] = L7;
+
+ L0 ^= C0(S, 0) ^ C1(S, 7) ^ C2(S, 6) ^ C3(S, 5) ^
+ C4(S, 4) ^ C5(S, 3) ^ C6(S, 2) ^ C7(S, 1);
+ L1 ^= C0(S, 1) ^ C1(S, 0) ^ C2(S, 7) ^ C3(S, 6) ^
+ C4(S, 5) ^ C5(S, 4) ^ C6(S, 3) ^ C7(S, 2);
+ L2 ^= C0(S, 2) ^ C1(S, 1) ^ C2(S, 0) ^ C3(S, 7) ^
+ C4(S, 6) ^ C5(S, 5) ^ C6(S, 4) ^ C7(S, 3);
+ L3 ^= C0(S, 3) ^ C1(S, 2) ^ C2(S, 1) ^ C3(S, 0) ^
+ C4(S, 7) ^ C5(S, 6) ^ C6(S, 5) ^ C7(S, 4);
+ L4 ^= C0(S, 4) ^ C1(S, 3) ^ C2(S, 2) ^ C3(S, 1) ^
+ C4(S, 0) ^ C5(S, 7) ^ C6(S, 6) ^ C7(S, 5);
+ L5 ^= C0(S, 5) ^ C1(S, 4) ^ C2(S, 3) ^ C3(S, 2) ^
+ C4(S, 1) ^ C5(S, 0) ^ C6(S, 7) ^ C7(S, 6);
+ L6 ^= C0(S, 6) ^ C1(S, 5) ^ C2(S, 4) ^ C3(S, 3) ^
+ C4(S, 2) ^ C5(S, 1) ^ C6(S, 0) ^ C7(S, 7);
+ L7 ^= C0(S, 7) ^ C1(S, 6) ^ C2(S, 5) ^ C3(S, 4) ^
+ C4(S, 3) ^ C5(S, 2) ^ C6(S, 1) ^ C7(S, 0);
+
+ S.q[0] = L0;
+ S.q[1] = L1;
+ S.q[2] = L2;
+ S.q[3] = L3;
+ S.q[4] = L4;
+ S.q[5] = L5;
+ S.q[6] = L6;
+ S.q[7] = L7;
+# else
+ L0 = C0(K, 0);
+ L1 = C1(K, 0);
+ L2 = C2(K, 0);
+ L3 = C3(K, 0);
+ L4 = C4(K, 0);
+ L5 = C5(K, 0);
+ L6 = C6(K, 0);
+ L7 = C7(K, 0);
+ L0 ^= RC[r];
+
+ L1 ^= C0(K, 1);
+ L2 ^= C1(K, 1);
+ L3 ^= C2(K, 1);
+ L4 ^= C3(K, 1);
+ L5 ^= C4(K, 1);
+ L6 ^= C5(K, 1);
+ L7 ^= C6(K, 1);
+ L0 ^= C7(K, 1);
+
+ L2 ^= C0(K, 2);
+ L3 ^= C1(K, 2);
+ L4 ^= C2(K, 2);
+ L5 ^= C3(K, 2);
+ L6 ^= C4(K, 2);
+ L7 ^= C5(K, 2);
+ L0 ^= C6(K, 2);
+ L1 ^= C7(K, 2);
+
+ L3 ^= C0(K, 3);
+ L4 ^= C1(K, 3);
+ L5 ^= C2(K, 3);
+ L6 ^= C3(K, 3);
+ L7 ^= C4(K, 3);
+ L0 ^= C5(K, 3);
+ L1 ^= C6(K, 3);
+ L2 ^= C7(K, 3);
+
+ L4 ^= C0(K, 4);
+ L5 ^= C1(K, 4);
+ L6 ^= C2(K, 4);
+ L7 ^= C3(K, 4);
+ L0 ^= C4(K, 4);
+ L1 ^= C5(K, 4);
+ L2 ^= C6(K, 4);
+ L3 ^= C7(K, 4);
+
+ L5 ^= C0(K, 5);
+ L6 ^= C1(K, 5);
+ L7 ^= C2(K, 5);
+ L0 ^= C3(K, 5);
+ L1 ^= C4(K, 5);
+ L2 ^= C5(K, 5);
+ L3 ^= C6(K, 5);
+ L4 ^= C7(K, 5);
+
+ L6 ^= C0(K, 6);
+ L7 ^= C1(K, 6);
+ L0 ^= C2(K, 6);
+ L1 ^= C3(K, 6);
+ L2 ^= C4(K, 6);
+ L3 ^= C5(K, 6);
+ L4 ^= C6(K, 6);
+ L5 ^= C7(K, 6);
+
+ L7 ^= C0(K, 7);
+ L0 ^= C1(K, 7);
+ L1 ^= C2(K, 7);
+ L2 ^= C3(K, 7);
+ L3 ^= C4(K, 7);
+ L4 ^= C5(K, 7);
+ L5 ^= C6(K, 7);
+ L6 ^= C7(K, 7);
+
+ K.q[0] = L0;
+ K.q[1] = L1;
+ K.q[2] = L2;
+ K.q[3] = L3;
+ K.q[4] = L4;
+ K.q[5] = L5;
+ K.q[6] = L6;
+ K.q[7] = L7;
+
+ L0 ^= C0(S, 0);
+ L1 ^= C1(S, 0);
+ L2 ^= C2(S, 0);
+ L3 ^= C3(S, 0);
+ L4 ^= C4(S, 0);
+ L5 ^= C5(S, 0);
+ L6 ^= C6(S, 0);
+ L7 ^= C7(S, 0);
+
+ L1 ^= C0(S, 1);
+ L2 ^= C1(S, 1);
+ L3 ^= C2(S, 1);
+ L4 ^= C3(S, 1);
+ L5 ^= C4(S, 1);
+ L6 ^= C5(S, 1);
+ L7 ^= C6(S, 1);
+ L0 ^= C7(S, 1);
+
+ L2 ^= C0(S, 2);
+ L3 ^= C1(S, 2);
+ L4 ^= C2(S, 2);
+ L5 ^= C3(S, 2);
+ L6 ^= C4(S, 2);
+ L7 ^= C5(S, 2);
+ L0 ^= C6(S, 2);
+ L1 ^= C7(S, 2);
+
+ L3 ^= C0(S, 3);
+ L4 ^= C1(S, 3);
+ L5 ^= C2(S, 3);
+ L6 ^= C3(S, 3);
+ L7 ^= C4(S, 3);
+ L0 ^= C5(S, 3);
+ L1 ^= C6(S, 3);
+ L2 ^= C7(S, 3);
+
+ L4 ^= C0(S, 4);
+ L5 ^= C1(S, 4);
+ L6 ^= C2(S, 4);
+ L7 ^= C3(S, 4);
+ L0 ^= C4(S, 4);
+ L1 ^= C5(S, 4);
+ L2 ^= C6(S, 4);
+ L3 ^= C7(S, 4);
+
+ L5 ^= C0(S, 5);
+ L6 ^= C1(S, 5);
+ L7 ^= C2(S, 5);
+ L0 ^= C3(S, 5);
+ L1 ^= C4(S, 5);
+ L2 ^= C5(S, 5);
+ L3 ^= C6(S, 5);
+ L4 ^= C7(S, 5);
+
+ L6 ^= C0(S, 6);
+ L7 ^= C1(S, 6);
+ L0 ^= C2(S, 6);
+ L1 ^= C3(S, 6);
+ L2 ^= C4(S, 6);
+ L3 ^= C5(S, 6);
+ L4 ^= C6(S, 6);
+ L5 ^= C7(S, 6);
+
+ L7 ^= C0(S, 7);
+ L0 ^= C1(S, 7);
+ L1 ^= C2(S, 7);
+ L2 ^= C3(S, 7);
+ L3 ^= C4(S, 7);
+ L4 ^= C5(S, 7);
+ L5 ^= C6(S, 7);
+ L6 ^= C7(S, 7);
+
+ S.q[0] = L0;
+ S.q[1] = L1;
+ S.q[2] = L2;
+ S.q[3] = L3;
+ S.q[4] = L4;
+ S.q[5] = L5;
+ S.q[6] = L6;
+ S.q[7] = L7;
+# endif
+ }
+
+# ifdef STRICT_ALIGNMENT
+ if ((size_t)p & 7) {
+ int i;
+ for (i = 0; i < 64; i++)
+ H->c[i] ^= S.c[i] ^ p[i];
+ } else
+# endif
+ {
+ const u64 *pa = (const u64 *)p;
+ H->q[0] ^= S.q[0] ^ pa[0];
+ H->q[1] ^= S.q[1] ^ pa[1];
+ H->q[2] ^= S.q[2] ^ pa[2];
+ H->q[3] ^= S.q[3] ^ pa[3];
+ H->q[4] ^= S.q[4] ^ pa[4];
+ H->q[5] ^= S.q[5] ^ pa[5];
+ H->q[6] ^= S.q[6] ^ pa[6];
+ H->q[7] ^= S.q[7] ^ pa[7];
+ }
#endif
- p += 64;
- } while(--n);
- }
+ p += 64;
+ } while (--n);
+}
diff --git a/openssl/crypto/whrlpool/wp_dgst.c b/openssl/crypto/whrlpool/wp_dgst.c
index 7e28bef51..e33bb4f83 100644
--- a/openssl/crypto/whrlpool/wp_dgst.c
+++ b/openssl/crypto/whrlpool/wp_dgst.c
@@ -56,210 +56,202 @@
#include <string.h>
fips_md_init(WHIRLPOOL)
- {
- memset (c,0,sizeof(*c));
- return(1);
- }
+{
+ memset(c, 0, sizeof(*c));
+ return (1);
+}
-int WHIRLPOOL_Update (WHIRLPOOL_CTX *c,const void *_inp,size_t bytes)
- {
- /* Well, largest suitable chunk size actually is
- * (1<<(sizeof(size_t)*8-3))-64, but below number
- * is large enough for not to care about excessive
- * calls to WHIRLPOOL_BitUpdate... */
- size_t chunk = ((size_t)1)<<(sizeof(size_t)*8-4);
- const unsigned char *inp = _inp;
+int WHIRLPOOL_Update(WHIRLPOOL_CTX *c, const void *_inp, size_t bytes)
+{
+ /*
+ * Well, largest suitable chunk size actually is
+ * (1<<(sizeof(size_t)*8-3))-64, but below number is large enough for not
+ * to care about excessive calls to WHIRLPOOL_BitUpdate...
+ */
+ size_t chunk = ((size_t)1) << (sizeof(size_t) * 8 - 4);
+ const unsigned char *inp = _inp;
- while (bytes>=chunk)
- {
- WHIRLPOOL_BitUpdate(c,inp,chunk*8);
- bytes -= chunk;
- inp += chunk;
- }
- if (bytes)
- WHIRLPOOL_BitUpdate(c,inp,bytes*8);
+ while (bytes >= chunk) {
+ WHIRLPOOL_BitUpdate(c, inp, chunk * 8);
+ bytes -= chunk;
+ inp += chunk;
+ }
+ if (bytes)
+ WHIRLPOOL_BitUpdate(c, inp, bytes * 8);
- return(1);
- }
+ return (1);
+}
-void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c,const void *_inp,size_t bits)
- {
- size_t n;
- unsigned int bitoff = c->bitoff,
- bitrem = bitoff%8,
- inpgap = (8-(unsigned int)bits%8)&7;
- const unsigned char *inp=_inp;
-
- /* This 256-bit increment procedure relies on the size_t
- * being natural size of CPU register, so that we don't
- * have to mask the value in order to detect overflows. */
- c->bitlen[0] += bits;
- if (c->bitlen[0] < bits) /* overflow */
- {
- n = 1;
- do { c->bitlen[n]++;
- } while(c->bitlen[n]==0
- && ++n<(WHIRLPOOL_COUNTER/sizeof(size_t)));
- }
+void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
+{
+ size_t n;
+ unsigned int bitoff = c->bitoff,
+ bitrem = bitoff % 8, inpgap = (8 - (unsigned int)bits % 8) & 7;
+ const unsigned char *inp = _inp;
+ /*
+ * This 256-bit increment procedure relies on the size_t being natural
+ * size of CPU register, so that we don't have to mask the value in order
+ * to detect overflows.
+ */
+ c->bitlen[0] += bits;
+ if (c->bitlen[0] < bits) { /* overflow */
+ n = 1;
+ do {
+ c->bitlen[n]++;
+ } while (c->bitlen[n] == 0
+ && ++n < (WHIRLPOOL_COUNTER / sizeof(size_t)));
+ }
#ifndef OPENSSL_SMALL_FOOTPRINT
- reconsider:
- if (inpgap==0 && bitrem==0) /* byte-oriented loop */
- {
- while (bits)
- {
- if (bitoff==0 && (n=bits/WHIRLPOOL_BBLOCK))
- {
- whirlpool_block(c,inp,n);
- inp += n*WHIRLPOOL_BBLOCK/8;
- bits %= WHIRLPOOL_BBLOCK;
- }
- else
- {
- unsigned int byteoff = bitoff/8;
+ reconsider:
+ if (inpgap == 0 && bitrem == 0) { /* byte-oriented loop */
+ while (bits) {
+ if (bitoff == 0 && (n = bits / WHIRLPOOL_BBLOCK)) {
+ whirlpool_block(c, inp, n);
+ inp += n * WHIRLPOOL_BBLOCK / 8;
+ bits %= WHIRLPOOL_BBLOCK;
+ } else {
+ unsigned int byteoff = bitoff / 8;
- bitrem = WHIRLPOOL_BBLOCK - bitoff;/* re-use bitrem */
- if (bits >= bitrem)
- {
- bits -= bitrem;
- bitrem /= 8;
- memcpy(c->data+byteoff,inp,bitrem);
- inp += bitrem;
- whirlpool_block(c,c->data,1);
- bitoff = 0;
- }
- else
- {
- memcpy(c->data+byteoff,inp,bits/8);
- bitoff += (unsigned int)bits;
- bits = 0;
- }
- c->bitoff = bitoff;
- }
- }
- }
- else /* bit-oriented loop */
+ bitrem = WHIRLPOOL_BBLOCK - bitoff; /* re-use bitrem */
+ if (bits >= bitrem) {
+ bits -= bitrem;
+ bitrem /= 8;
+ memcpy(c->data + byteoff, inp, bitrem);
+ inp += bitrem;
+ whirlpool_block(c, c->data, 1);
+ bitoff = 0;
+ } else {
+ memcpy(c->data + byteoff, inp, bits / 8);
+ bitoff += (unsigned int)bits;
+ bits = 0;
+ }
+ c->bitoff = bitoff;
+ }
+ }
+ } else /* bit-oriented loop */
#endif
- {
- /*
- inp
- |
- +-------+-------+-------
- |||||||||||||||||||||
- +-------+-------+-------
- +-------+-------+-------+-------+-------
- |||||||||||||| c->data
- +-------+-------+-------+-------+-------
- |
- c->bitoff/8
- */
- while (bits)
- {
- unsigned int byteoff = bitoff/8;
- unsigned char b;
+ {
+ /*-
+ inp
+ |
+ +-------+-------+-------
+ |||||||||||||||||||||
+ +-------+-------+-------
+ +-------+-------+-------+-------+-------
+ |||||||||||||| c->data
+ +-------+-------+-------+-------+-------
+ |
+ c->bitoff/8
+ */
+ while (bits) {
+ unsigned int byteoff = bitoff / 8;
+ unsigned char b;
#ifndef OPENSSL_SMALL_FOOTPRINT
- if (bitrem==inpgap)
- {
- c->data[byteoff++] |= inp[0] & (0xff>>inpgap);
- inpgap = 8-inpgap;
- bitoff += inpgap; bitrem = 0; /* bitoff%8 */
- bits -= inpgap; inpgap = 0; /* bits%8 */
- inp++;
- if (bitoff==WHIRLPOOL_BBLOCK)
- {
- whirlpool_block(c,c->data,1);
- bitoff = 0;
- }
- c->bitoff = bitoff;
- goto reconsider;
- }
- else
+ if (bitrem == inpgap) {
+ c->data[byteoff++] |= inp[0] & (0xff >> inpgap);
+ inpgap = 8 - inpgap;
+ bitoff += inpgap;
+ bitrem = 0; /* bitoff%8 */
+ bits -= inpgap;
+ inpgap = 0; /* bits%8 */
+ inp++;
+ if (bitoff == WHIRLPOOL_BBLOCK) {
+ whirlpool_block(c, c->data, 1);
+ bitoff = 0;
+ }
+ c->bitoff = bitoff;
+ goto reconsider;
+ } else
#endif
- if (bits>=8)
- {
- b = ((inp[0]<<inpgap) | (inp[1]>>(8-inpgap)));
- b &= 0xff;
- if (bitrem) c->data[byteoff++] |= b>>bitrem;
- else c->data[byteoff++] = b;
- bitoff += 8;
- bits -= 8;
- inp++;
- if (bitoff>=WHIRLPOOL_BBLOCK)
- {
- whirlpool_block(c,c->data,1);
- byteoff = 0;
- bitoff %= WHIRLPOOL_BBLOCK;
- }
- if (bitrem) c->data[byteoff] = b<<(8-bitrem);
- }
- else /* remaining less than 8 bits */
- {
- b = (inp[0]<<inpgap)&0xff;
- if (bitrem) c->data[byteoff++] |= b>>bitrem;
- else c->data[byteoff++] = b;
- bitoff += (unsigned int)bits;
- if (bitoff==WHIRLPOOL_BBLOCK)
- {
- whirlpool_block(c,c->data,1);
- byteoff = 0;
- bitoff %= WHIRLPOOL_BBLOCK;
- }
- if (bitrem) c->data[byteoff] = b<<(8-bitrem);
- bits = 0;
- }
- c->bitoff = bitoff;
- }
- }
- }
+ if (bits >= 8) {
+ b = ((inp[0] << inpgap) | (inp[1] >> (8 - inpgap)));
+ b &= 0xff;
+ if (bitrem)
+ c->data[byteoff++] |= b >> bitrem;
+ else
+ c->data[byteoff++] = b;
+ bitoff += 8;
+ bits -= 8;
+ inp++;
+ if (bitoff >= WHIRLPOOL_BBLOCK) {
+ whirlpool_block(c, c->data, 1);
+ byteoff = 0;
+ bitoff %= WHIRLPOOL_BBLOCK;
+ }
+ if (bitrem)
+ c->data[byteoff] = b << (8 - bitrem);
+ } else { /* remaining less than 8 bits */
+
+ b = (inp[0] << inpgap) & 0xff;
+ if (bitrem)
+ c->data[byteoff++] |= b >> bitrem;
+ else
+ c->data[byteoff++] = b;
+ bitoff += (unsigned int)bits;
+ if (bitoff == WHIRLPOOL_BBLOCK) {
+ whirlpool_block(c, c->data, 1);
+ byteoff = 0;
+ bitoff %= WHIRLPOOL_BBLOCK;
+ }
+ if (bitrem)
+ c->data[byteoff] = b << (8 - bitrem);
+ bits = 0;
+ }
+ c->bitoff = bitoff;
+ }
+ }
+}
-int WHIRLPOOL_Final (unsigned char *md,WHIRLPOOL_CTX *c)
- {
- unsigned int bitoff = c->bitoff,
- byteoff = bitoff/8;
- size_t i,j,v;
- unsigned char *p;
+int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c)
+{
+ unsigned int bitoff = c->bitoff, byteoff = bitoff / 8;
+ size_t i, j, v;
+ unsigned char *p;
- bitoff %= 8;
- if (bitoff) c->data[byteoff] |= 0x80>>bitoff;
- else c->data[byteoff] = 0x80;
- byteoff++;
+ bitoff %= 8;
+ if (bitoff)
+ c->data[byteoff] |= 0x80 >> bitoff;
+ else
+ c->data[byteoff] = 0x80;
+ byteoff++;
- /* pad with zeros */
- if (byteoff > (WHIRLPOOL_BBLOCK/8-WHIRLPOOL_COUNTER))
- {
- if (byteoff<WHIRLPOOL_BBLOCK/8)
- memset(&c->data[byteoff],0,WHIRLPOOL_BBLOCK/8-byteoff);
- whirlpool_block(c,c->data,1);
- byteoff = 0;
- }
- if (byteoff < (WHIRLPOOL_BBLOCK/8-WHIRLPOOL_COUNTER))
- memset(&c->data[byteoff],0,
- (WHIRLPOOL_BBLOCK/8-WHIRLPOOL_COUNTER)-byteoff);
- /* smash 256-bit c->bitlen in big-endian order */
- p = &c->data[WHIRLPOOL_BBLOCK/8-1]; /* last byte in c->data */
- for(i=0;i<WHIRLPOOL_COUNTER/sizeof(size_t);i++)
- for(v=c->bitlen[i],j=0;j<sizeof(size_t);j++,v>>=8)
- *p-- = (unsigned char)(v&0xff);
+ /* pad with zeros */
+ if (byteoff > (WHIRLPOOL_BBLOCK / 8 - WHIRLPOOL_COUNTER)) {
+ if (byteoff < WHIRLPOOL_BBLOCK / 8)
+ memset(&c->data[byteoff], 0, WHIRLPOOL_BBLOCK / 8 - byteoff);
+ whirlpool_block(c, c->data, 1);
+ byteoff = 0;
+ }
+ if (byteoff < (WHIRLPOOL_BBLOCK / 8 - WHIRLPOOL_COUNTER))
+ memset(&c->data[byteoff], 0,
+ (WHIRLPOOL_BBLOCK / 8 - WHIRLPOOL_COUNTER) - byteoff);
+ /* smash 256-bit c->bitlen in big-endian order */
+ p = &c->data[WHIRLPOOL_BBLOCK / 8 - 1]; /* last byte in c->data */
+ for (i = 0; i < WHIRLPOOL_COUNTER / sizeof(size_t); i++)
+ for (v = c->bitlen[i], j = 0; j < sizeof(size_t); j++, v >>= 8)
+ *p-- = (unsigned char)(v & 0xff);
- whirlpool_block(c,c->data,1);
+ whirlpool_block(c, c->data, 1);
- if (md) {
- memcpy(md,c->H.c,WHIRLPOOL_DIGEST_LENGTH);
- memset(c,0,sizeof(*c));
- return(1);
- }
- return(0);
- }
+ if (md) {
+ memcpy(md, c->H.c, WHIRLPOOL_DIGEST_LENGTH);
+ memset(c, 0, sizeof(*c));
+ return (1);
+ }
+ return (0);
+}
-unsigned char *WHIRLPOOL(const void *inp, size_t bytes,unsigned char *md)
- {
- WHIRLPOOL_CTX ctx;
- static unsigned char m[WHIRLPOOL_DIGEST_LENGTH];
+unsigned char *WHIRLPOOL(const void *inp, size_t bytes, unsigned char *md)
+{
+ WHIRLPOOL_CTX ctx;
+ static unsigned char m[WHIRLPOOL_DIGEST_LENGTH];
- if (md == NULL) md=m;
- WHIRLPOOL_Init(&ctx);
- WHIRLPOOL_Update(&ctx,inp,bytes);
- WHIRLPOOL_Final(md,&ctx);
- return(md);
- }
+ if (md == NULL)
+ md = m;
+ WHIRLPOOL_Init(&ctx);
+ WHIRLPOOL_Update(&ctx, inp, bytes);
+ WHIRLPOOL_Final(md, &ctx);
+ return (md);
+}
diff --git a/openssl/crypto/whrlpool/wp_locl.h b/openssl/crypto/whrlpool/wp_locl.h
index 94e56a39f..6e7b549e1 100644
--- a/openssl/crypto/whrlpool/wp_locl.h
+++ b/openssl/crypto/whrlpool/wp_locl.h
@@ -1,3 +1,3 @@
#include <openssl/whrlpool.h>
-void whirlpool_block(WHIRLPOOL_CTX *,const void *,size_t);
+void whirlpool_block(WHIRLPOOL_CTX *, const void *, size_t);
diff --git a/openssl/crypto/whrlpool/wp_test.c b/openssl/crypto/whrlpool/wp_test.c
index c68c2c62c..2ea6251a5 100644
--- a/openssl/crypto/whrlpool/wp_test.c
+++ b/openssl/crypto/whrlpool/wp_test.c
@@ -13,216 +13,229 @@
int main(int argc, char *argv[])
{
printf("No Whirlpool support\n");
- return(0);
+ return (0);
}
#else
/* ISO/IEC 10118-3 test vector set */
unsigned char iso_test_1[WHIRLPOOL_DIGEST_LENGTH] = {
- 0x19,0xFA,0x61,0xD7,0x55,0x22,0xA4,0x66,
- 0x9B,0x44,0xE3,0x9C,0x1D,0x2E,0x17,0x26,
- 0xC5,0x30,0x23,0x21,0x30,0xD4,0x07,0xF8,
- 0x9A,0xFE,0xE0,0x96,0x49,0x97,0xF7,0xA7,
- 0x3E,0x83,0xBE,0x69,0x8B,0x28,0x8F,0xEB,
- 0xCF,0x88,0xE3,0xE0,0x3C,0x4F,0x07,0x57,
- 0xEA,0x89,0x64,0xE5,0x9B,0x63,0xD9,0x37,
- 0x08,0xB1,0x38,0xCC,0x42,0xA6,0x6E,0xB3 };
+ 0x19, 0xFA, 0x61, 0xD7, 0x55, 0x22, 0xA4, 0x66,
+ 0x9B, 0x44, 0xE3, 0x9C, 0x1D, 0x2E, 0x17, 0x26,
+ 0xC5, 0x30, 0x23, 0x21, 0x30, 0xD4, 0x07, 0xF8,
+ 0x9A, 0xFE, 0xE0, 0x96, 0x49, 0x97, 0xF7, 0xA7,
+ 0x3E, 0x83, 0xBE, 0x69, 0x8B, 0x28, 0x8F, 0xEB,
+ 0xCF, 0x88, 0xE3, 0xE0, 0x3C, 0x4F, 0x07, 0x57,
+ 0xEA, 0x89, 0x64, 0xE5, 0x9B, 0x63, 0xD9, 0x37,
+ 0x08, 0xB1, 0x38, 0xCC, 0x42, 0xA6, 0x6E, 0xB3
+};
unsigned char iso_test_2[WHIRLPOOL_DIGEST_LENGTH] = {
- 0x8A,0xCA,0x26,0x02,0x79,0x2A,0xEC,0x6F,
- 0x11,0xA6,0x72,0x06,0x53,0x1F,0xB7,0xD7,
- 0xF0,0xDF,0xF5,0x94,0x13,0x14,0x5E,0x69,
- 0x73,0xC4,0x50,0x01,0xD0,0x08,0x7B,0x42,
- 0xD1,0x1B,0xC6,0x45,0x41,0x3A,0xEF,0xF6,
- 0x3A,0x42,0x39,0x1A,0x39,0x14,0x5A,0x59,
- 0x1A,0x92,0x20,0x0D,0x56,0x01,0x95,0xE5,
- 0x3B,0x47,0x85,0x84,0xFD,0xAE,0x23,0x1A };
+ 0x8A, 0xCA, 0x26, 0x02, 0x79, 0x2A, 0xEC, 0x6F,
+ 0x11, 0xA6, 0x72, 0x06, 0x53, 0x1F, 0xB7, 0xD7,
+ 0xF0, 0xDF, 0xF5, 0x94, 0x13, 0x14, 0x5E, 0x69,
+ 0x73, 0xC4, 0x50, 0x01, 0xD0, 0x08, 0x7B, 0x42,
+ 0xD1, 0x1B, 0xC6, 0x45, 0x41, 0x3A, 0xEF, 0xF6,
+ 0x3A, 0x42, 0x39, 0x1A, 0x39, 0x14, 0x5A, 0x59,
+ 0x1A, 0x92, 0x20, 0x0D, 0x56, 0x01, 0x95, 0xE5,
+ 0x3B, 0x47, 0x85, 0x84, 0xFD, 0xAE, 0x23, 0x1A
+};
unsigned char iso_test_3[WHIRLPOOL_DIGEST_LENGTH] = {
- 0x4E,0x24,0x48,0xA4,0xC6,0xF4,0x86,0xBB,
- 0x16,0xB6,0x56,0x2C,0x73,0xB4,0x02,0x0B,
- 0xF3,0x04,0x3E,0x3A,0x73,0x1B,0xCE,0x72,
- 0x1A,0xE1,0xB3,0x03,0xD9,0x7E,0x6D,0x4C,
- 0x71,0x81,0xEE,0xBD,0xB6,0xC5,0x7E,0x27,
- 0x7D,0x0E,0x34,0x95,0x71,0x14,0xCB,0xD6,
- 0xC7,0x97,0xFC,0x9D,0x95,0xD8,0xB5,0x82,
- 0xD2,0x25,0x29,0x20,0x76,0xD4,0xEE,0xF5 };
+ 0x4E, 0x24, 0x48, 0xA4, 0xC6, 0xF4, 0x86, 0xBB,
+ 0x16, 0xB6, 0x56, 0x2C, 0x73, 0xB4, 0x02, 0x0B,
+ 0xF3, 0x04, 0x3E, 0x3A, 0x73, 0x1B, 0xCE, 0x72,
+ 0x1A, 0xE1, 0xB3, 0x03, 0xD9, 0x7E, 0x6D, 0x4C,
+ 0x71, 0x81, 0xEE, 0xBD, 0xB6, 0xC5, 0x7E, 0x27,
+ 0x7D, 0x0E, 0x34, 0x95, 0x71, 0x14, 0xCB, 0xD6,
+ 0xC7, 0x97, 0xFC, 0x9D, 0x95, 0xD8, 0xB5, 0x82,
+ 0xD2, 0x25, 0x29, 0x20, 0x76, 0xD4, 0xEE, 0xF5
+};
unsigned char iso_test_4[WHIRLPOOL_DIGEST_LENGTH] = {
- 0x37,0x8C,0x84,0xA4,0x12,0x6E,0x2D,0xC6,
- 0xE5,0x6D,0xCC,0x74,0x58,0x37,0x7A,0xAC,
- 0x83,0x8D,0x00,0x03,0x22,0x30,0xF5,0x3C,
- 0xE1,0xF5,0x70,0x0C,0x0F,0xFB,0x4D,0x3B,
- 0x84,0x21,0x55,0x76,0x59,0xEF,0x55,0xC1,
- 0x06,0xB4,0xB5,0x2A,0xC5,0xA4,0xAA,0xA6,
- 0x92,0xED,0x92,0x00,0x52,0x83,0x8F,0x33,
- 0x62,0xE8,0x6D,0xBD,0x37,0xA8,0x90,0x3E };
+ 0x37, 0x8C, 0x84, 0xA4, 0x12, 0x6E, 0x2D, 0xC6,
+ 0xE5, 0x6D, 0xCC, 0x74, 0x58, 0x37, 0x7A, 0xAC,
+ 0x83, 0x8D, 0x00, 0x03, 0x22, 0x30, 0xF5, 0x3C,
+ 0xE1, 0xF5, 0x70, 0x0C, 0x0F, 0xFB, 0x4D, 0x3B,
+ 0x84, 0x21, 0x55, 0x76, 0x59, 0xEF, 0x55, 0xC1,
+ 0x06, 0xB4, 0xB5, 0x2A, 0xC5, 0xA4, 0xAA, 0xA6,
+ 0x92, 0xED, 0x92, 0x00, 0x52, 0x83, 0x8F, 0x33,
+ 0x62, 0xE8, 0x6D, 0xBD, 0x37, 0xA8, 0x90, 0x3E
+};
unsigned char iso_test_5[WHIRLPOOL_DIGEST_LENGTH] = {
- 0xF1,0xD7,0x54,0x66,0x26,0x36,0xFF,0xE9,
- 0x2C,0x82,0xEB,0xB9,0x21,0x2A,0x48,0x4A,
- 0x8D,0x38,0x63,0x1E,0xAD,0x42,0x38,0xF5,
- 0x44,0x2E,0xE1,0x3B,0x80,0x54,0xE4,0x1B,
- 0x08,0xBF,0x2A,0x92,0x51,0xC3,0x0B,0x6A,
- 0x0B,0x8A,0xAE,0x86,0x17,0x7A,0xB4,0xA6,
- 0xF6,0x8F,0x67,0x3E,0x72,0x07,0x86,0x5D,
- 0x5D,0x98,0x19,0xA3,0xDB,0xA4,0xEB,0x3B };
+ 0xF1, 0xD7, 0x54, 0x66, 0x26, 0x36, 0xFF, 0xE9,
+ 0x2C, 0x82, 0xEB, 0xB9, 0x21, 0x2A, 0x48, 0x4A,
+ 0x8D, 0x38, 0x63, 0x1E, 0xAD, 0x42, 0x38, 0xF5,
+ 0x44, 0x2E, 0xE1, 0x3B, 0x80, 0x54, 0xE4, 0x1B,
+ 0x08, 0xBF, 0x2A, 0x92, 0x51, 0xC3, 0x0B, 0x6A,
+ 0x0B, 0x8A, 0xAE, 0x86, 0x17, 0x7A, 0xB4, 0xA6,
+ 0xF6, 0x8F, 0x67, 0x3E, 0x72, 0x07, 0x86, 0x5D,
+ 0x5D, 0x98, 0x19, 0xA3, 0xDB, 0xA4, 0xEB, 0x3B
+};
unsigned char iso_test_6[WHIRLPOOL_DIGEST_LENGTH] = {
- 0xDC,0x37,0xE0,0x08,0xCF,0x9E,0xE6,0x9B,
- 0xF1,0x1F,0x00,0xED,0x9A,0xBA,0x26,0x90,
- 0x1D,0xD7,0xC2,0x8C,0xDE,0xC0,0x66,0xCC,
- 0x6A,0xF4,0x2E,0x40,0xF8,0x2F,0x3A,0x1E,
- 0x08,0xEB,0xA2,0x66,0x29,0x12,0x9D,0x8F,
- 0xB7,0xCB,0x57,0x21,0x1B,0x92,0x81,0xA6,
- 0x55,0x17,0xCC,0x87,0x9D,0x7B,0x96,0x21,
- 0x42,0xC6,0x5F,0x5A,0x7A,0xF0,0x14,0x67 };
+ 0xDC, 0x37, 0xE0, 0x08, 0xCF, 0x9E, 0xE6, 0x9B,
+ 0xF1, 0x1F, 0x00, 0xED, 0x9A, 0xBA, 0x26, 0x90,
+ 0x1D, 0xD7, 0xC2, 0x8C, 0xDE, 0xC0, 0x66, 0xCC,
+ 0x6A, 0xF4, 0x2E, 0x40, 0xF8, 0x2F, 0x3A, 0x1E,
+ 0x08, 0xEB, 0xA2, 0x66, 0x29, 0x12, 0x9D, 0x8F,
+ 0xB7, 0xCB, 0x57, 0x21, 0x1B, 0x92, 0x81, 0xA6,
+ 0x55, 0x17, 0xCC, 0x87, 0x9D, 0x7B, 0x96, 0x21,
+ 0x42, 0xC6, 0x5F, 0x5A, 0x7A, 0xF0, 0x14, 0x67
+};
unsigned char iso_test_7[WHIRLPOOL_DIGEST_LENGTH] = {
- 0x46,0x6E,0xF1,0x8B,0xAB,0xB0,0x15,0x4D,
- 0x25,0xB9,0xD3,0x8A,0x64,0x14,0xF5,0xC0,
- 0x87,0x84,0x37,0x2B,0xCC,0xB2,0x04,0xD6,
- 0x54,0x9C,0x4A,0xFA,0xDB,0x60,0x14,0x29,
- 0x4D,0x5B,0xD8,0xDF,0x2A,0x6C,0x44,0xE5,
- 0x38,0xCD,0x04,0x7B,0x26,0x81,0xA5,0x1A,
- 0x2C,0x60,0x48,0x1E,0x88,0xC5,0xA2,0x0B,
- 0x2C,0x2A,0x80,0xCF,0x3A,0x9A,0x08,0x3B };
+ 0x46, 0x6E, 0xF1, 0x8B, 0xAB, 0xB0, 0x15, 0x4D,
+ 0x25, 0xB9, 0xD3, 0x8A, 0x64, 0x14, 0xF5, 0xC0,
+ 0x87, 0x84, 0x37, 0x2B, 0xCC, 0xB2, 0x04, 0xD6,
+ 0x54, 0x9C, 0x4A, 0xFA, 0xDB, 0x60, 0x14, 0x29,
+ 0x4D, 0x5B, 0xD8, 0xDF, 0x2A, 0x6C, 0x44, 0xE5,
+ 0x38, 0xCD, 0x04, 0x7B, 0x26, 0x81, 0xA5, 0x1A,
+ 0x2C, 0x60, 0x48, 0x1E, 0x88, 0xC5, 0xA2, 0x0B,
+ 0x2C, 0x2A, 0x80, 0xCF, 0x3A, 0x9A, 0x08, 0x3B
+};
unsigned char iso_test_8[WHIRLPOOL_DIGEST_LENGTH] = {
- 0x2A,0x98,0x7E,0xA4,0x0F,0x91,0x70,0x61,
- 0xF5,0xD6,0xF0,0xA0,0xE4,0x64,0x4F,0x48,
- 0x8A,0x7A,0x5A,0x52,0xDE,0xEE,0x65,0x62,
- 0x07,0xC5,0x62,0xF9,0x88,0xE9,0x5C,0x69,
- 0x16,0xBD,0xC8,0x03,0x1B,0xC5,0xBE,0x1B,
- 0x7B,0x94,0x76,0x39,0xFE,0x05,0x0B,0x56,
- 0x93,0x9B,0xAA,0xA0,0xAD,0xFF,0x9A,0xE6,
- 0x74,0x5B,0x7B,0x18,0x1C,0x3B,0xE3,0xFD };
+ 0x2A, 0x98, 0x7E, 0xA4, 0x0F, 0x91, 0x70, 0x61,
+ 0xF5, 0xD6, 0xF0, 0xA0, 0xE4, 0x64, 0x4F, 0x48,
+ 0x8A, 0x7A, 0x5A, 0x52, 0xDE, 0xEE, 0x65, 0x62,
+ 0x07, 0xC5, 0x62, 0xF9, 0x88, 0xE9, 0x5C, 0x69,
+ 0x16, 0xBD, 0xC8, 0x03, 0x1B, 0xC5, 0xBE, 0x1B,
+ 0x7B, 0x94, 0x76, 0x39, 0xFE, 0x05, 0x0B, 0x56,
+ 0x93, 0x9B, 0xAA, 0xA0, 0xAD, 0xFF, 0x9A, 0xE6,
+ 0x74, 0x5B, 0x7B, 0x18, 0x1C, 0x3B, 0xE3, 0xFD
+};
unsigned char iso_test_9[WHIRLPOOL_DIGEST_LENGTH] = {
- 0x0C,0x99,0x00,0x5B,0xEB,0x57,0xEF,0xF5,
- 0x0A,0x7C,0xF0,0x05,0x56,0x0D,0xDF,0x5D,
- 0x29,0x05,0x7F,0xD8,0x6B,0x20,0xBF,0xD6,
- 0x2D,0xEC,0xA0,0xF1,0xCC,0xEA,0x4A,0xF5,
- 0x1F,0xC1,0x54,0x90,0xED,0xDC,0x47,0xAF,
- 0x32,0xBB,0x2B,0x66,0xC3,0x4F,0xF9,0xAD,
- 0x8C,0x60,0x08,0xAD,0x67,0x7F,0x77,0x12,
- 0x69,0x53,0xB2,0x26,0xE4,0xED,0x8B,0x01 };
-
-int main (int argc,char *argv[])
-{ unsigned char md[WHIRLPOOL_DIGEST_LENGTH];
- int i;
- WHIRLPOOL_CTX ctx;
-
-#ifdef OPENSSL_IA32_SSE2
- /* Alternative to this is to call OpenSSL_add_all_algorithms...
- * The below code is retained exclusively for debugging purposes. */
- { char *env;
-
- if ((env=getenv("OPENSSL_ia32cap")))
- OPENSSL_ia32cap = strtoul (env,NULL,0);
- }
-#endif
+ 0x0C, 0x99, 0x00, 0x5B, 0xEB, 0x57, 0xEF, 0xF5,
+ 0x0A, 0x7C, 0xF0, 0x05, 0x56, 0x0D, 0xDF, 0x5D,
+ 0x29, 0x05, 0x7F, 0xD8, 0x6B, 0x20, 0xBF, 0xD6,
+ 0x2D, 0xEC, 0xA0, 0xF1, 0xCC, 0xEA, 0x4A, 0xF5,
+ 0x1F, 0xC1, 0x54, 0x90, 0xED, 0xDC, 0x47, 0xAF,
+ 0x32, 0xBB, 0x2B, 0x66, 0xC3, 0x4F, 0xF9, 0xAD,
+ 0x8C, 0x60, 0x08, 0xAD, 0x67, 0x7F, 0x77, 0x12,
+ 0x69, 0x53, 0xB2, 0x26, 0xE4, 0xED, 0x8B, 0x01
+};
- fprintf(stdout,"Testing Whirlpool ");
-
- WHIRLPOOL("",0,md);
- if (memcmp(md,iso_test_1,sizeof(iso_test_1)))
- { fflush(stdout);
- fprintf(stderr,"\nTEST 1 of 9 failed.\n");
- return 1;
- }
- else
- fprintf(stdout,"."); fflush(stdout);
-
- WHIRLPOOL("a",1,md);
- if (memcmp(md,iso_test_2,sizeof(iso_test_2)))
- { fflush(stdout);
- fprintf(stderr,"\nTEST 2 of 9 failed.\n");
- return 1;
- }
- else
- fprintf(stdout,"."); fflush(stdout);
-
- WHIRLPOOL("abc",3,md);
- if (memcmp(md,iso_test_3,sizeof(iso_test_3)))
- { fflush(stdout);
- fprintf(stderr,"\nTEST 3 of 9 failed.\n");
- return 1;
- }
- else
- fprintf(stdout,"."); fflush(stdout);
-
- WHIRLPOOL("message digest",14,md);
- if (memcmp(md,iso_test_4,sizeof(iso_test_4)))
- { fflush(stdout);
- fprintf(stderr,"\nTEST 4 of 9 failed.\n");
- return 1;
- }
- else
- fprintf(stdout,"."); fflush(stdout);
-
- WHIRLPOOL("abcdefghijklmnopqrstuvwxyz",26,md);
- if (memcmp(md,iso_test_5,sizeof(iso_test_5)))
- { fflush(stdout);
- fprintf(stderr,"\nTEST 5 of 9 failed.\n");
- return 1;
- }
- else
- fprintf(stdout,"."); fflush(stdout);
-
- WHIRLPOOL( "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz"
- "0123456789",62,md);
- if (memcmp(md,iso_test_6,sizeof(iso_test_6)))
- { fflush(stdout);
- fprintf(stderr,"\nTEST 6 of 9 failed.\n");
- return 1;
- }
- else
- fprintf(stdout,"."); fflush(stdout);
-
- WHIRLPOOL( "1234567890""1234567890""1234567890""1234567890"
- "1234567890""1234567890""1234567890""1234567890",80,md);
- if (memcmp(md,iso_test_7,sizeof(iso_test_7)))
- { fflush(stdout);
- fprintf(stderr,"\nTEST 7 of 9 failed.\n");
- return 1;
- }
- else
- fprintf(stdout,"."); fflush(stdout);
-
- WHIRLPOOL("abcdbcdecdefdefgefghfghighijhijk",32,md);
- if (memcmp(md,iso_test_8,sizeof(iso_test_8)))
- { fflush(stdout);
- fprintf(stderr,"\nTEST 8 of 9 failed.\n");
- return 1;
- }
- else
- fprintf(stdout,"."); fflush(stdout);
-
- WHIRLPOOL_Init (&ctx);
- for (i=0;i<1000000;i+=288)
- WHIRLPOOL_Update (&ctx, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
- "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
- "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
- "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
- "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
- "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
- "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
- "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
- "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
- (1000000-i)<288?1000000-i:288);
- WHIRLPOOL_Final (md,&ctx);
- if (memcmp(md,iso_test_9,sizeof(iso_test_9)))
- { fflush(stdout);
- fprintf(stderr,"\nTEST 9 of 9 failed.\n");
- return 1;
+int main(int argc, char *argv[])
+{
+ unsigned char md[WHIRLPOOL_DIGEST_LENGTH];
+ int i;
+ WHIRLPOOL_CTX ctx;
+
+# ifdef OPENSSL_IA32_SSE2
+ /*
+ * Alternative to this is to call OpenSSL_add_all_algorithms... The below
+ * code is retained exclusively for debugging purposes.
+ */
+ {
+ char *env;
+
+ if ((env = getenv("OPENSSL_ia32cap")))
+ OPENSSL_ia32cap = strtoul(env, NULL, 0);
}
- else
- fprintf(stdout,"."); fflush(stdout);
-
- fprintf(stdout," passed.\n"); fflush(stdout);
-
- return 0;
+# endif
+
+ fprintf(stdout, "Testing Whirlpool ");
+
+ WHIRLPOOL("", 0, md);
+ if (memcmp(md, iso_test_1, sizeof(iso_test_1))) {
+ fflush(stdout);
+ fprintf(stderr, "\nTEST 1 of 9 failed.\n");
+ return 1;
+ } else
+ fprintf(stdout, ".");
+ fflush(stdout);
+
+ WHIRLPOOL("a", 1, md);
+ if (memcmp(md, iso_test_2, sizeof(iso_test_2))) {
+ fflush(stdout);
+ fprintf(stderr, "\nTEST 2 of 9 failed.\n");
+ return 1;
+ } else
+ fprintf(stdout, ".");
+ fflush(stdout);
+
+ WHIRLPOOL("abc", 3, md);
+ if (memcmp(md, iso_test_3, sizeof(iso_test_3))) {
+ fflush(stdout);
+ fprintf(stderr, "\nTEST 3 of 9 failed.\n");
+ return 1;
+ } else
+ fprintf(stdout, ".");
+ fflush(stdout);
+
+ WHIRLPOOL("message digest", 14, md);
+ if (memcmp(md, iso_test_4, sizeof(iso_test_4))) {
+ fflush(stdout);
+ fprintf(stderr, "\nTEST 4 of 9 failed.\n");
+ return 1;
+ } else
+ fprintf(stdout, ".");
+ fflush(stdout);
+
+ WHIRLPOOL("abcdefghijklmnopqrstuvwxyz", 26, md);
+ if (memcmp(md, iso_test_5, sizeof(iso_test_5))) {
+ fflush(stdout);
+ fprintf(stderr, "\nTEST 5 of 9 failed.\n");
+ return 1;
+ } else
+ fprintf(stdout, ".");
+ fflush(stdout);
+
+ WHIRLPOOL("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "abcdefghijklmnopqrstuvwxyz" "0123456789", 62, md);
+ if (memcmp(md, iso_test_6, sizeof(iso_test_6))) {
+ fflush(stdout);
+ fprintf(stderr, "\nTEST 6 of 9 failed.\n");
+ return 1;
+ } else
+ fprintf(stdout, ".");
+ fflush(stdout);
+
+ WHIRLPOOL("1234567890" "1234567890" "1234567890" "1234567890"
+ "1234567890" "1234567890" "1234567890" "1234567890", 80, md);
+ if (memcmp(md, iso_test_7, sizeof(iso_test_7))) {
+ fflush(stdout);
+ fprintf(stderr, "\nTEST 7 of 9 failed.\n");
+ return 1;
+ } else
+ fprintf(stdout, ".");
+ fflush(stdout);
+
+ WHIRLPOOL("abcdbcdecdefdefgefghfghighijhijk", 32, md);
+ if (memcmp(md, iso_test_8, sizeof(iso_test_8))) {
+ fflush(stdout);
+ fprintf(stderr, "\nTEST 8 of 9 failed.\n");
+ return 1;
+ } else
+ fprintf(stdout, ".");
+ fflush(stdout);
+
+ WHIRLPOOL_Init(&ctx);
+ for (i = 0; i < 1000000; i += 288)
+ WHIRLPOOL_Update(&ctx, "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa"
+ "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa"
+ "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa"
+ "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa"
+ "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa"
+ "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa"
+ "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa"
+ "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa"
+ "aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa",
+ (1000000 - i) < 288 ? 1000000 - i : 288);
+ WHIRLPOOL_Final(md, &ctx);
+ if (memcmp(md, iso_test_9, sizeof(iso_test_9))) {
+ fflush(stdout);
+ fprintf(stderr, "\nTEST 9 of 9 failed.\n");
+ return 1;
+ } else
+ fprintf(stdout, ".");
+ fflush(stdout);
+
+ fprintf(stdout, " passed.\n");
+ fflush(stdout);
+
+ return 0;
}
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 11:05:41 +0000