random crypto cleanups
Subsystems (3)
cover random crypto cleanups
1.be_le.patch:
Introduce {load/store}_{be/le}{32/64}() macros and use them instead of open-coded conversions. Introduce BYTEn() macros for extraction of n'th byte from wider integers and use it.
2.wp.patch:
Fix gcc3.4.3 -O2 whirlpool stack overflow.
3.tf.patch:
Dramatically reduce size of twofish key setup code with modest increase of key setup time.
4.rot64.patch:
Introduce 64bit rotations (generic + i386 asm), convert few existing places to use it.
Per previous comments, replace inline -> __inline__ in headers.
z.patch:
use BYTEn() in more places, simplify some tgr192.c bits
Cumulative patch was tested with tcrypt.
Please apply patches 1-4, comment on z.patch.
Patches will be mailed as replies.
--
vda
Herbert Xu
maintainerQuoted 2 lines · Denis Vlasenko
Please apply patches 1-4, comment on z.patch.
Thanks for the patches. Please put the changelog entries in the patch emails next time.
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtQuoted 6 lines · Herbert Xu
Quoted 2 lines · Denis Vlasenko
Please apply patches 1-4, comment on z.patch.
Thanks for the patches. Please put the changelog entries in the patch emails next time.
ok, here they are.
--
vda
PATCH 1/1 ROR -> ror32
Remove local ROR, use ror32 instead.
crypto/des.c +1 -5
@@ -35,8 +35,6 @@#define DES3_EDE_EXPKEY_WORDS (3 * DES_EXPKEY_WORDS)#define DES3_EDE_BLOCK_SIZE DES_BLOCK_SIZE -#define ROR (d,c,o) ((d) = (d) >> (c) | (d) << (o)) -struct des_ctx {u8 iv[DES_BLOCK_SIZE ];u32 expkey[DES_EXPKEY_WORDS ];
@@ -1159,9 +1157,7 @@ not_weak: w |= (b1[k[18 +24 ]] | b0[k[19 +24 ]]) <<4 ; w |= (b1[k[20 +24 ]] | b0[k[21 +24 ]]) <<2 ; w |= b1[k[22 +24 ]] | b0[k[23 +24 ]]; - -ROR (w,4 ,28 );/* could be eliminated */ - expkey[1 ] = w; + expkey[1 ] =ror32 (w,4 );/* could be eliminated */ k +=48 ; expkey +=2 ;
PATCH 1/4 do not open-code be/le conversions.
In reply to Denis Vlasenkohelper.h: macros load_le, store_le, and friends.
use them where appropriate.
(helper.h is not moved to include/: we havecrypto/internal.h, crypto/scatterwalk.h, why notcrypto/helper.h ?)
--
vda
crypto/aes.c +27 -29
@@ -58,6 +58,7 @@#include <linux/errno.h> #include <linux/crypto.h> #include <asm/byteorder.h> +#include "helper.h" #define AES_MIN_KEY_SIZE 16#define AES_MAX_KEY_SIZE 32
@@ -73,9 +74,6 @@ byte(const u32 x, const unsigned n)return x >> (n <<3 ); } -#define u32_in (x) le32_to_cpu(*(const u32 *)(x)) -#define u32_out (to, from) (*(u32 *)(to) = cpu_to_le32(from)) -struct aes_ctx {int key_length;u32 E[60 ];
@@ -265,10 +263,10 @@ aes_set_key(void *ctx_arg, const u8 *in_ ctx->key_length = key_len; -E_KEY [0 ] =u32_in (in_key); -E_KEY [1 ] =u32_in (in_key +4 ); -E_KEY [2 ] =u32_in (in_key +8 ); -E_KEY [3 ] =u32_in (in_key +12 ); +E_KEY [0 ] =load_le32 (in_key,0 ); +E_KEY [1 ] =load_le32 (in_key,1 ); +E_KEY [2 ] =load_le32 (in_key,2 ); +E_KEY [3 ] =load_le32 (in_key,3 );switch (key_len) {case 16 :
@@ -278,17 +276,17 @@ aes_set_key(void *ctx_arg, const u8 *in_break ;case 24 : -E_KEY [4 ] =u32_in (in_key +16 ); - t =E_KEY [5 ] =u32_in (in_key +20 ); +E_KEY [4 ] =load_le32 (in_key,4 ); + t =E_KEY [5 ] =load_le32 (in_key,5 );for (i =0 ; i <8 ; ++i)loop6 (i);break ;case 32 : -E_KEY [4 ] =u32_in (in_key +16 ); -E_KEY [5 ] =u32_in (in_key +20 ); -E_KEY [6 ] =u32_in (in_key +24 ); - t =E_KEY [7 ] =u32_in (in_key +28 ); +E_KEY [4 ] =load_le32 (in_key,4 ); +E_KEY [5 ] =load_le32 (in_key,5 ); +E_KEY [6 ] =load_le32 (in_key,6 ); + t =E_KEY [7 ] =load_le32 (in_key,7 );for (i =0 ; i <7 ; ++i)loop8 (i);break ;
@@ -327,10 +325,10 @@ static void aes_encrypt(void *ctx_arg, uu32 b0[4 ], b1[4 ];const u32 *kp =E_KEY +4 ; - b0[0 ] =u32_in (in) ^E_KEY [0 ]; - b0[1 ] =u32_in (in +4 ) ^E_KEY [1 ]; - b0[2 ] =u32_in (in +8 ) ^E_KEY [2 ]; - b0[3 ] =u32_in (in +12 ) ^E_KEY [3 ]; + b0[0 ] =load_le32 (in,0 ) ^E_KEY [0 ]; + b0[1 ] =load_le32 (in,1 ) ^E_KEY [1 ]; + b0[2 ] =load_le32 (in,2 ) ^E_KEY [2 ]; + b0[3 ] =load_le32 (in,3 ) ^E_KEY [3 ];if (ctx->key_length >24 ) {f_nround (b1, b0, kp);
@@ -353,10 +351,10 @@ static void aes_encrypt(void *ctx_arg, uf_nround (b1, b0, kp);f_lround (b0, b1, kp); -u32_out (out, b0[0 ]); -u32_out (out +4 , b0[1 ]); -u32_out (out +8 , b0[2 ]); -u32_out (out +12 , b0[3 ]); +store_le32 (out,0 , b0[0 ]); +store_le32 (out,1 , b0[1 ]); +store_le32 (out,2 , b0[2 ]); +store_le32 (out,3 , b0[3 ]); }/* decrypt a block of text */
@@ -381,10 +379,10 @@ static void aes_decrypt(void *ctx_arg, uconst int key_len = ctx->key_length;const u32 *kp =D_KEY + key_len +20 ; - b0[0 ] =u32_in (in) ^E_KEY [key_len +24 ]; - b0[1 ] =u32_in (in +4 ) ^E_KEY [key_len +25 ]; - b0[2 ] =u32_in (in +8 ) ^E_KEY [key_len +26 ]; - b0[3 ] =u32_in (in +12 ) ^E_KEY [key_len +27 ]; + b0[0 ] =load_le32 (in,0 ) ^E_KEY [key_len +24 ]; + b0[1 ] =load_le32 (in,1 ) ^E_KEY [key_len +25 ]; + b0[2 ] =load_le32 (in,2 ) ^E_KEY [key_len +26 ]; + b0[3 ] =load_le32 (in,3 ) ^E_KEY [key_len +27 ];if (key_len >24 ) {i_nround (b1, b0, kp);
@@ -407,10 +405,10 @@ static void aes_decrypt(void *ctx_arg, ui_nround (b1, b0, kp);i_lround (b0, b1, kp); -u32_out (out, b0[0 ]); -u32_out (out +4 , b0[1 ]); -u32_out (out +8 , b0[2 ]); -u32_out (out +12 , b0[3 ]); +store_le32 (out,0 , b0[0 ]); +store_le32 (out,1 , b0[1 ]); +store_le32 (out,2 , b0[2 ]); +store_le32 (out,3 , b0[3 ]); }
crypto/anubis.c +15 -30
113 lines not on this page · raw message
crypto/blowfish.c +9 -12
@@ -21,6 +21,7 @@#include <linux/mm.h> #include <asm/scatterlist.h> #include <linux/crypto.h> +#include "helper.h" #define BF_BLOCK_SIZE 8#define BF_MIN_KEY_SIZE 4
@@ -349,25 +350,21 @@ static void encrypt_block(struct bf_ctxstatic void bf_encrypt (void *ctx,u8 *dst,const u8 *src) { -const __be32 *in_blk = (const __be32 *)src; -__be32 *const out_blk = (__be32 *)dst;u32 in32[2 ], out32[2 ]; - in32[0 ] =be32_to_cpu (in_blk[0 ]); - in32[1 ] =be32_to_cpu (in_blk[1 ]); + in32[0 ] =load_be32 (src,0 ); + in32[1 ] =load_be32 (src,1 );encrypt_block (ctx, out32, in32); - out_blk[0 ] =cpu_to_be32 (out32[0 ]); - out_blk[1 ] =cpu_to_be32 (out32[1 ]); +store_be32 (dst,0 , out32[0 ]); +store_be32 (dst,1 , out32[1 ]); }static void bf_decrypt (void *ctx,u8 *dst,const u8 *src) { -const __be32 *in_blk = (const __be32 *)src; -__be32 *const out_blk = (__be32 *)dst;const u32 *P = ((struct bf_ctx *)ctx)->p;const u32 *S = ((struct bf_ctx *)ctx)->s; -u32 yl =be32_to_cpu (in_blk[0 ]); -u32 yr =be32_to_cpu (in_blk[1 ]); +u32 yl =load_be32 (src,0 ); +u32 yr =load_be32 (src,1 );ROUND (yr, yl,17 );ROUND (yl, yr,16 );
@@ -389,8 +386,8 @@ static void bf_decrypt(void *ctx, u8 *ds yl ^=P [1 ]; yr ^=P [0 ]; - out_blk[0 ] =cpu_to_be32 (yr); - out_blk[1 ] =cpu_to_be32 (yl); +store_be32 (dst,0 , yr); +store_be32 (dst,1 , yl); }/*
crypto/cast5.c +13 -27
@@ -26,6 +26,7 @@#include <linux/module.h> #include <linux/errno.h> #include <linux/string.h> +#include "helper.h" #define CAST5_BLOCK_SIZE 8#define CAST5_MIN_KEY_SIZE 5
@@ -589,8 +590,8 @@ static void cast5_encrypt(void *ctx, u8/* (L0,R0) <-- (m1...m64). (Split the plaintext into left and * right 32-bit halves L0 = m1...m32 and R0 = m33...m64.) */ - l = inbuf[0 ] <<24 | inbuf[1 ] <<16 | inbuf[2 ] <<8 | inbuf[3 ]; - r = inbuf[4 ] <<24 | inbuf[5 ] <<16 | inbuf[6 ] <<8 | inbuf[7 ]; + l =load_be32 (inbuf,0 ); + r =load_be32 (inbuf,1 );/* (16 rounds) for i from 1 to 16, compute Li and Ri as follows: * Li = Ri-1;
@@ -634,14 +635,8 @@ static void cast5_encrypt(void *ctx, u8/* c1...c64 <-- (R16,L16). (Exchange final blocks L16, R16 and * concatenate to form the ciphertext.) */ - outbuf[0 ] = (r >>24 ) &0xff ; - outbuf[1 ] = (r >>16 ) &0xff ; - outbuf[2 ] = (r >>8 ) &0xff ; - outbuf[3 ] = r &0xff ; - outbuf[4 ] = (l >>24 ) &0xff ; - outbuf[5 ] = (l >>16 ) &0xff ; - outbuf[6 ] = (l >>8 ) &0xff ; - outbuf[7 ] = l &0xff ; +store_be32 (outbuf,0 , r); +store_be32 (outbuf,1 , l); }static void cast5_decrypt (void *ctx,u8 * outbuf,const u8 * inbuf)
@@ -655,8 +650,8 @@ static void cast5_decrypt(void *ctx, u8 Km = c->Km; Kr = c->Kr; - l = inbuf[0 ] <<24 | inbuf[1 ] <<16 | inbuf[2 ] <<8 | inbuf[3 ]; - r = inbuf[4 ] <<24 | inbuf[5 ] <<16 | inbuf[6 ] <<8 | inbuf[7 ]; + l =load_be32 (inbuf,0 ); + r =load_be32 (inbuf,1 );if (!(c->rr)) { t = l; l = r; r = t ^F1 (r, Km[15 ], Kr[15 ]);
@@ -690,14 +685,8 @@ static void cast5_decrypt(void *ctx, u8 t = l; l = r; r = t ^F1 (r, Km[0 ], Kr[0 ]); } - outbuf[0 ] = (r >>24 ) &0xff ; - outbuf[1 ] = (r >>16 ) &0xff ; - outbuf[2 ] = (r >>8 ) &0xff ; - outbuf[3 ] = r &0xff ; - outbuf[4 ] = (l >>24 ) &0xff ; - outbuf[5 ] = (l >>16 ) &0xff ; - outbuf[6 ] = (l >>8 ) &0xff ; - outbuf[7 ] = l &0xff ; +store_be32 (outbuf,0 , r); +store_be32 (outbuf,1 , l); }static void key_schedule (u32 * x,u32 * z,u32 * k)
@@ -795,13 +784,10 @@ cast5_setkey(void *ctx, const u8 * key,memset (p_key,0 ,16 );memcpy (p_key, key, key_len); - - x[0 ] = p_key[0 ] <<24 | p_key[1 ] <<16 | p_key[2 ] <<8 | p_key[3 ]; - x[1 ] = p_key[4 ] <<24 | p_key[5 ] <<16 | p_key[6 ] <<8 | p_key[7 ]; - x[2 ] = - p_key[8 ] <<24 | p_key[9 ] <<16 | p_key[10 ] <<8 | p_key[11 ]; - x[3 ] = - p_key[12 ] <<24 | p_key[13 ] <<16 | p_key[14 ] <<8 | p_key[15 ]; + x[0 ] =load_be32 (p_key,0 ); + x[1 ] =load_be32 (p_key,1 ); + x[2 ] =load_be32 (p_key,2 ); + x[3 ] =load_be32 (p_key,3 );key_schedule (x, z, k);for (i =0 ; i <16 ; i++)
crypto/cast6.c +29 -54
119 lines not on this page · raw message
crypto/crc32c.c +3 -2
@@ -17,6 +17,7 @@#include <linux/crypto.h> #include <linux/crc32c.h> #include <asm/byteorder.h> +#include "helper.h" #define CHKSUM_BLOCK_SIZE 32#define CHKSUM_DIGEST_SIZE 4
@@ -52,7 +53,7 @@ static int chksum_setkey(void *ctx, cons *flags =CRYPTO_TFM_RES_BAD_KEY_LEN ;return -EINVAL ; } - mctx->crc =__cpu_to_le32 (*(u32 *)key); + mctx->crc =load_le32 (key,0 );return 0 ; }
@@ -71,7 +72,7 @@ static void chksum_final(void *ctx, u8 *struct chksum_ctx *mctx = ctx;u32 mcrc = (mctx->crc ^ ~(u32 )0 ); - *(u32 *)out =__le32_to_cpu (mcrc); +store_le32 (out,0 , mcrc); }static struct crypto_alg alg = {
crypto/des.c +14 -57
101 lines not on this page · raw message
crypto/helper.h +56 -0
56 lines not on this page · raw message
crypto/hmac.c +0 -1
@@ -131,4 +131,3 @@ EXPORT_SYMBOL_GPL(crypto_hmac_init);EXPORT_SYMBOL_GPL (crypto_hmac_update);EXPORT_SYMBOL_GPL (crypto_hmac_final);EXPORT_SYMBOL_GPL (crypto_hmac); -
crypto/internal.h +0 -1
@@ -89,4 +89,3 @@ void crypto_exit_cipher_ops(struct cryptvoid crypto_exit_compress_ops (struct crypto_tfm *tfm);#endif /* _CRYPTO_INTERNAL_H */ -
crypto/khazad.c +5 -36
77 lines not on this page · raw message
crypto/md4.c +3 -9
@@ -37,12 +37,6 @@ struct md4_ctx {u64 byte_count; }; -static inline u32 lshift (u32 x,unsigned int s) -{ - x &=0xFFFFFFFF ; -return ((x << s) &0xFFFFFFFF ) | (x >> (32 - s)); -} -static inline u32 F (u32 x,u32 y,u32 z) {return (x & y) | ((~x) & z);
@@ -58,9 +52,9 @@ static inline u32 H(u32 x, u32 y, u32 z)return x ^ y ^ z; } -#define ROUND1 (a,b,c,d,k,s) (a = lshift(a + F(b,c,d) + k, s)) -#define ROUND2 (a,b,c,d,k,s) (a = lshift(a + G(b,c,d) + k + (u32)0x5A827999,s)) -#define ROUND3 (a,b,c,d,k,s) (a = lshift(a + H(b,c,d) + k + (u32)0x6ED9EBA1,s)) +#define ROUND1 (a,b,c,d,k,s) (a = rol32(a + F(b,c,d) + k, s)) +#define ROUND2 (a,b,c,d,k,s) (a = rol32(a + G(b,c,d) + k + (u32)0x5A827999, s)) +#define ROUND3 (a,b,c,d,k,s) (a = rol32(a + H(b,c,d) + k + (u32)0x6ED9EBA1, s))/* XXX: this stuff can be optimized */ static inline void le32_to_cpu_array (u32 *buf,unsigned int words)
crypto/michael_mic.c +7 -21
@@ -14,6 +14,7 @@#include <linux/module.h> #include <linux/string.h> #include <linux/crypto.h> +#include "helper.h" struct michael_mic_ctx {
@@ -43,21 +44,6 @@ do { \ }while (0 ) -static inline u32 get_le32(const u8 *p) -{ -return p[0 ] | (p[1 ] <<8 ) | (p[2 ] <<16 ) | (p[3 ] <<24 ); -} - - -static inline void put_le32 (u8 *p,u32 v) -{ - p[0 ] = v; - p[1 ] = v >>8 ; - p[2 ] = v >>16 ; - p[3 ] = v >>24 ; -} - - static void michael_init(void *ctx) {struct michael_mic_ctx *mctx = ctx;
@@ -81,13 +67,13 @@ static void michael_update(void *ctx, coif (mctx->pending_len <4 )return ; - mctx->l ^=get_le32 (mctx->pending); + mctx->l ^=load_le32 (mctx->pending,0 );michael_block (mctx->l, mctx->r); mctx->pending_len =0 ; }while (len >=4 ) { - mctx->l ^=get_le32 (data); + mctx->l ^=load_le32 (data,0 );michael_block (mctx->l, mctx->r); data +=4 ; len -=4 ;
@@ -125,8 +111,8 @@ static void michael_final(void *ctx, u8/* l ^= 0; */ michael_block (mctx->l, mctx->r); -put_le32 (out, mctx->l); -put_le32 (out +4 , mctx->r); +store_le32 (out,0 , mctx->l); +store_le32 (out,1 , mctx->r); }
@@ -139,8 +125,8 @@ static int michael_setkey(void *ctx, con *flags =CRYPTO_TFM_RES_BAD_KEY_LEN ;return -EINVAL ; } - mctx->l =get_le32 (key); - mctx->r =get_le32 (key +4 ); + mctx->l =load_le32 (key,0 ); + mctx->r =load_le32 (key,1 );return 0 ; }
crypto/serpent.c +22 -27
83 lines not on this page · raw message
crypto/sha1.c +5 -18
@@ -23,6 +23,7 @@#include <linux/cryptohash.h> #include <asm/scatterlist.h> #include <asm/byteorder.h> +#include "helper.h" #define SHA1_DIGEST_SIZE 20#define SHA1_HMAC_BLOCK_SIZE 64
@@ -67,25 +68,15 @@ static void sha1_update(void *ctx, constmemcpy (&sctx->buffer[j], &data[i], len - i); } -/* Add padding and return the message digest. */ static void sha1_final (void * ctx,u8 *out) {struct sha1_ctx *sctx = ctx; -u32 i, j, index, padlen; -u64 t; +u32 i, index, padlen;u8 bits[8 ] = {0 , };static const u8 padding[64 ] = {0x80 , }; - t = sctx->count; - bits[7 ] =0xff & t; t>>=8 ; - bits[6 ] =0xff & t; t>>=8 ; - bits[5 ] =0xff & t; t>>=8 ; - bits[4 ] =0xff & t; t>>=8 ; - bits[3 ] =0xff & t; t>>=8 ; - bits[2 ] =0xff & t; t>>=8 ; - bits[1 ] =0xff & t; t>>=8 ; - bits[0 ] =0xff & t; +store_be64 (bits,0 , sctx->count);/* Pad out to 56 mod 64 */ index = (sctx->count >>3 ) &0x3f ;
@@ -96,12 +87,8 @@ static void sha1_final(void* ctx, u8 *ousha1_update (sctx, bits,sizeof bits);/* Store state in digest */ -for (i = j =0 ; i <5 ; i++, j +=4 ) { -u32 t2 = sctx->state[i]; - out[j+3 ] = t2 &0xff ; t2>>=8 ; - out[j+2 ] = t2 &0xff ; t2>>=8 ; - out[j+1 ] = t2 &0xff ; t2>>=8 ; - out[j ] = t2 &0xff ; +for (i =0 ; i <5 ; i++) { +store_be32 (out, i, sctx->state[i]); }/* Wipe context */
crypto/sha256.c +8 -20
@@ -22,6 +22,7 @@#include <linux/crypto.h> #include <asm/scatterlist.h> #include <asm/byteorder.h> +#include "helper.h" #define SHA256_DIGEST_SIZE 32#define SHA256_HMAC_BLOCK_SIZE 64
@@ -58,7 +59,7 @@ static inline u32 Maj(u32 x, u32 y, u32static inline void LOAD_OP (int I ,u32 *W ,const u8 *input) { -W [I ] =__be32_to_cpu ( ((__be32 *)(input))[I ] ); +W [I ] =load_be32 (input,I ); }static inline void BLEND_OP (int I ,u32 *W )
@@ -280,21 +281,13 @@ static void sha256_final(void* ctx, u8 * {struct sha256_ctx *sctx = ctx;u8 bits[8 ]; -unsigned int index, pad_len, t; -int i, j; +unsigned int index, pad_len; +int i;static const u8 padding[64 ] = {0x80 , };/* Save number of bits */ - t = sctx->count[0 ]; - bits[7 ] = t; t >>=8 ; - bits[6 ] = t; t >>=8 ; - bits[5 ] = t; t >>=8 ; - bits[4 ] = t; - t = sctx->count[1 ]; - bits[3 ] = t; t >>=8 ; - bits[2 ] = t; t >>=8 ; - bits[1 ] = t; t >>=8 ; - bits[0 ] = t; +store_be32 (bits,1 , sctx->count[0 ]); +store_be32 (bits,0 , sctx->count[1 ]);/* Pad out to 56 mod 64. */ index = (sctx->count[0 ] >>3 ) &0x3f ;
@@ -305,18 +298,13 @@ static void sha256_final(void* ctx, u8 *sha256_update (sctx, bits,8 );/* Store state in digest */ -for (i = j =0 ; i <8 ; i++, j +=4 ) { - t = sctx->state[i]; - out[j+3 ] = t; t >>=8 ; - out[j+2 ] = t; t >>=8 ; - out[j+1 ] = t; t >>=8 ; - out[j ] = t; +for (i =0 ; i <8 ; i++) { +store_be32 (out, i, sctx->state[i]); }/* Zeroize sensitive information. */ memset (sctx,0 ,sizeof (*sctx)); } -static struct crypto_alg alg = { .cra_name ="sha256" ,
crypto/sha512.c +11 -33
72 lines not on this page · raw message
crypto/tea.c +25 -35
148 lines not on this page · raw message
crypto/tgr192.c +8 -44
80 lines not on this page · raw message
crypto/twofish.c +13 -13
@@ -42,6 +42,7 @@#include <linux/types.h> #include <linux/errno.h> #include <linux/crypto.h> +#include "helper.h" /* The large precomputed tables for the Twofish cipher (twofish.c)
@@ -540,9 +541,9 @@ static const u8 calc_sb_tbl[512] = {#define CALC_K (a, j, k, l, m, n) \ x = CALC_K_2 (k, l, k, l, 0); \ y = CALC_K_2 (m, n, m, n, 4); \ - y = (y << 8) + (y >> 24); \ + y = rol32(y, 8); \ x += y; y += x; ctx->a[j] = x; \ - ctx->a[(j) + 1] = (y << 9) + (y >> 23) + ctx->a[(j) + 1] = rol32(y, 9)#define CALC_K192_2 (a, b, c, d, j) \ CALC_K_2 (q0[a ^ key[(j) + 16]], \
@@ -553,9 +554,9 @@ static const u8 calc_sb_tbl[512] = {#define CALC_K192 (a, j, k, l, m, n) \ x = CALC_K192_2 (l, l, k, k, 0); \ y = CALC_K192_2 (n, n, m, m, 4); \ - y = (y << 8) + (y >> 24); \ + y = rol32(y, 8); \ x += y; y += x; ctx->a[j] = x; \ - ctx->a[(j) + 1] = (y << 9) + (y >> 23) + ctx->a[(j) + 1] = rol32(y, 9)#define CALC_K256_2 (a, b, j) \ CALC_K192_2 (q1[b ^ key[(j) + 24]], \
@@ -566,9 +567,9 @@ static const u8 calc_sb_tbl[512] = {#define CALC_K256 (a, j, k, l, m, n) \ x = CALC_K256_2 (k, l, 0); \ y = CALC_K256_2 (m, n, 4); \ - y = (y << 8) + (y >> 24); \ + y = rol32(y, 8); \ x += y; y += x; ctx->a[j] = x; \ - ctx->a[(j) + 1] = (y << 9) + (y >> 23) + ctx->a[(j) + 1] = rol32(y, 9)/* Macros to compute the g() function in the encryption and decryption
@@ -620,14 +621,14 @@ static const u8 calc_sb_tbl[512] = {* OUTUNPACK unpacks word number n from the variable named by x, using * whitening subkey number m. */ -#define INPACK (n, x, m) \ - x = in[4 * (n)] ^ (in[4 * (n) + 1] << 8) \ - ^ (in[4 * (n) + 2] << 16) ^ (in[4 * (n) + 3] << 24) ^ ctx->w[m] +#define INPACK (n, x, m) { \ + x = load_le32(in, n) ^ ctx->w[m]; \ +} -#define OUTUNPACK (n, x, m) \ +#define OUTUNPACK (n, x, m) { \ x ^= ctx->w[m]; \ - out[4 * (n)] = x; out[4 * (n) + 1] = x >> 8; \ - out[4 * (n) + 2] = x >> 16; out[4 * (n) + 3] = x >> 24 + store_le32(out, n, x); \ +}#define TF_MIN_KEY_SIZE 16#define TF_MAX_KEY_SIZE 32
@@ -867,7 +868,6 @@ static void twofish_decrypt(void *cx, u8OUTUNPACK (1 , b,1 );OUTUNPACK (2 , c,2 );OUTUNPACK (3 , d,3 ); - }static struct crypto_alg alg = {
crypto/wp512.c +4 -23
@@ -24,6 +24,7 @@#include <linux/mm.h> #include <asm/scatterlist.h> #include <linux/crypto.h> +#include "helper.h" #define WP512_DIGEST_SIZE 64#define WP384_DIGEST_SIZE 48
@@ -778,18 +779,9 @@ static void wp512_process_buffer(structu64 block[8 ];/* mu(buffer) */ u64 state[8 ];/* the cipher state */ u64 L [8 ]; -u8 *buffer = wctx->buffer; -for (i =0 ; i <8 ; i++, buffer +=8 ) { - block[i] = - (((u64 )buffer[0 ] ) <<56 ) ^ - (((u64 )buffer[1 ] &0xffL ) <<48 ) ^ - (((u64 )buffer[2 ] &0xffL ) <<40 ) ^ - (((u64 )buffer[3 ] &0xffL ) <<32 ) ^ - (((u64 )buffer[4 ] &0xffL ) <<24 ) ^ - (((u64 )buffer[5 ] &0xffL ) <<16 ) ^ - (((u64 )buffer[6 ] &0xffL ) <<8 ) ^ - (((u64 )buffer[7 ] &0xffL ) ); +for (i =0 ; i <8 ; i++) { + block[i] =load_be64 (wctx->buffer, i); } state[0 ] = block[0 ] ^ (K [0 ] = wctx->hash[0 ]);
@@ -985,7 +977,6 @@ static void wp512_process_buffer(struct wctx->hash[5 ] ^= state[5 ] ^ block[5 ]; wctx->hash[6 ] ^= state[6 ] ^ block[6 ]; wctx->hash[7 ] ^= state[7 ] ^ block[7 ]; - }static void wp512_init (void *ctx) {
@@ -1058,7 +1049,6 @@ static void wp512_update(void *ctx, cons wctx->bufferBits = bufferBits; wctx->bufferPos = bufferPos; - }static void wp512_final (void *ctx,u8 *out)
@@ -1069,7 +1059,6 @@ static void wp512_final(void *ctx, u8 *ou8 *bitLength = wctx->bitLength;int bufferBits = wctx->bufferBits;int bufferPos = wctx->bufferPos; -u8 *digest = out; buffer[bufferPos] |=0x80U >> (bufferBits &7 ); bufferPos++;
@@ -1089,15 +1078,7 @@ static void wp512_final(void *ctx, u8 *o bitLength, WP512_LENGTHBYTES);wp512_process_buffer (wctx);for (i =0 ; i <WP512_DIGEST_SIZE /8 ; i++) { - digest[0 ] = (u8)(wctx->hash[i] >>56 ); - digest[1 ] = (u8)(wctx->hash[i] >>48 ); - digest[2 ] = (u8)(wctx->hash[i] >>40 ); - digest[3 ] = (u8)(wctx->hash[i] >>32 ); - digest[4 ] = (u8)(wctx->hash[i] >>24 ); - digest[5 ] = (u8)(wctx->hash[i] >>16 ); - digest[6 ] = (u8)(wctx->hash[i] >>8 ); - digest[7 ] = (u8)(wctx->hash[i] ); - digest +=8 ; +store_be64 (out, i, wctx->hash[i]); } wctx->bufferBits = bufferBits; wctx->bufferPos = bufferPos;
PATCH 2/4 whirlpool gcc bug fix
In reply to Denis Vlasenkowp was not usable: stack overflow with certain gcc versions. --
vda
crypto/wp512.c +155 -151
@@ -793,80 +793,84 @@ static void wp512_process_buffer(struct state[6 ] = block[6 ] ^ (K [6 ] = wctx->hash[6 ]); state[7 ] = block[7 ] ^ (K [7 ] = wctx->hash[7 ]); +/* we do not use L[0] = C0[...] ^ C1[...] ^ ... ^ rc[r] +** due to gcc -O2 (3.4.3) optimizer bug: +** this will cause excessive spills (~3K stack used) +** See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21141 */ for (r =1 ; r <=WHIRLPOOL_ROUNDS ; r++) { -L [0 ] =C0 [(int )(K [0 ] >>56 ) ] ^ -C1 [(int )(K [7 ] >>48 ) &0xff ] ^ -C2 [(int )(K [6 ] >>40 ) &0xff ] ^ -C3 [(int )(K [5 ] >>32 ) &0xff ] ^ -C4 [(int )(K [4 ] >>24 ) &0xff ] ^ -C5 [(int )(K [3 ] >>16 ) &0xff ] ^ -C6 [(int )(K [2 ] >>8 ) &0xff ] ^ -C7 [(int )(K [1 ] ) &0xff ] ^ - rc[r]; - -L [1 ] =C0 [(int )(K [1 ] >>56 ) ] ^ -C1 [(int )(K [0 ] >>48 ) &0xff ] ^ -C2 [(int )(K [7 ] >>40 ) &0xff ] ^ -C3 [(int )(K [6 ] >>32 ) &0xff ] ^ -C4 [(int )(K [5 ] >>24 ) &0xff ] ^ -C5 [(int )(K [4 ] >>16 ) &0xff ] ^ -C6 [(int )(K [3 ] >>8 ) &0xff ] ^ -C7 [(int )(K [2 ] ) &0xff ]; - -L [2 ] =C0 [(int )(K [2 ] >>56 ) ] ^ -C1 [(int )(K [1 ] >>48 ) &0xff ] ^ -C2 [(int )(K [0 ] >>40 ) &0xff ] ^ -C3 [(int )(K [7 ] >>32 ) &0xff ] ^ -C4 [(int )(K [6 ] >>24 ) &0xff ] ^ -C5 [(int )(K [5 ] >>16 ) &0xff ] ^ -C6 [(int )(K [4 ] >>8 ) &0xff ] ^ -C7 [(int )(K [3 ] ) &0xff ]; - -L [3 ] =C0 [(int )(K [3 ] >>56 ) ] ^ -C1 [(int )(K [2 ] >>48 ) &0xff ] ^ -C2 [(int )(K [1 ] >>40 ) &0xff ] ^ -C3 [(int )(K [0 ] >>32 ) &0xff ] ^ -C4 [(int )(K [7 ] >>24 ) &0xff ] ^ -C5 [(int )(K [6 ] >>16 ) &0xff ] ^ -C6 [(int )(K [5 ] >>8 ) &0xff ] ^ -C7 [(int )(K [4 ] ) &0xff ]; - -L [4 ] =C0 [(int )(K [4 ] >>56 ) ] ^ -C1 [(int )(K [3 ] >>48 ) &0xff ] ^ -C2 [(int )(K [2 ] >>40 ) &0xff ] ^ -C3 [(int )(K [1 ] >>32 ) &0xff ] ^ -C4 [(int )(K [0 ] >>24 ) &0xff ] ^ -C5 [(int )(K [7 ] >>16 ) &0xff ] ^ -C6 [(int )(K [6 ] >>8 ) &0xff ] ^ -C7 [(int )(K [5 ] ) &0xff ]; - -L [5 ] =C0 [(int )(K [5 ] >>56 ) ] ^ -C1 [(int )(K [4 ] >>48 ) &0xff ] ^ -C2 [(int )(K [3 ] >>40 ) &0xff ] ^ -C3 [(int )(K [2 ] >>32 ) &0xff ] ^ -C4 [(int )(K [1 ] >>24 ) &0xff ] ^ -C5 [(int )(K [0 ] >>16 ) &0xff ] ^ -C6 [(int )(K [7 ] >>8 ) &0xff ] ^ -C7 [(int )(K [6 ] ) &0xff ]; - -L [6 ] =C0 [(int )(K [6 ] >>56 ) ] ^ -C1 [(int )(K [5 ] >>48 ) &0xff ] ^ -C2 [(int )(K [4 ] >>40 ) &0xff ] ^ -C3 [(int )(K [3 ] >>32 ) &0xff ] ^ -C4 [(int )(K [2 ] >>24 ) &0xff ] ^ -C5 [(int )(K [1 ] >>16 ) &0xff ] ^ -C6 [(int )(K [0 ] >>8 ) &0xff ] ^ -C7 [(int )(K [7 ] ) &0xff ]; - -L [7 ] =C0 [(int )(K [7 ] >>56 ) ] ^ -C1 [(int )(K [6 ] >>48 ) &0xff ] ^ -C2 [(int )(K [5 ] >>40 ) &0xff ] ^ -C3 [(int )(K [4 ] >>32 ) &0xff ] ^ -C4 [(int )(K [3 ] >>24 ) &0xff ] ^ -C5 [(int )(K [2 ] >>16 ) &0xff ] ^ -C6 [(int )(K [1 ] >>8 ) &0xff ] ^ -C7 [(int )(K [0 ] ) &0xff ]; +L [0 ] =C0 [BYTE7 (K [0 ])]; +L [0 ] ^=C1 [BYTE6 (K [7 ])]; +L [0 ] ^=C2 [BYTE5 (K [6 ])]; +L [0 ] ^=C3 [BYTE4 (K [5 ])]; +L [0 ] ^=C4 [BYTE3 (K [4 ])]; +L [0 ] ^=C5 [BYTE2 (K [3 ])]; +L [0 ] ^=C6 [BYTE1 (K [2 ])]; +L [0 ] ^=C7 [BYTE0 (K [1 ])]; +L [0 ] ^= rc[r]; + +L [1 ] =C0 [BYTE7 (K [1 ])]; +L [1 ] ^=C1 [BYTE6 (K [0 ])]; +L [1 ] ^=C2 [BYTE5 (K [7 ])]; +L [1 ] ^=C3 [BYTE4 (K [6 ])]; +L [1 ] ^=C4 [BYTE3 (K [5 ])]; +L [1 ] ^=C5 [BYTE2 (K [4 ])]; +L [1 ] ^=C6 [BYTE1 (K [3 ])]; +L [1 ] ^=C7 [BYTE0 (K [2 ])]; + +L [2 ] =C0 [BYTE7 (K [2 ])]; +L [2 ] ^=C1 [BYTE6 (K [1 ])]; +L [2 ] ^=C2 [BYTE5 (K [0 ])]; +L [2 ] ^=C3 [BYTE4 (K [7 ])]; +L [2 ] ^=C4 [BYTE3 (K [6 ])]; +L [2 ] ^=C5 [BYTE2 (K [5 ])]; +L [2 ] ^=C6 [BYTE1 (K [4 ])]; +L [2 ] ^=C7 [BYTE0 (K [3 ])]; + +L [3 ] =C0 [BYTE7 (K [3 ])]; +L [3 ] ^=C1 [BYTE6 (K [2 ])]; +L [3 ] ^=C2 [BYTE5 (K [1 ])]; +L [3 ] ^=C3 [BYTE4 (K [0 ])]; +L [3 ] ^=C4 [BYTE3 (K [7 ])]; +L [3 ] ^=C5 [BYTE2 (K [6 ])]; +L [3 ] ^=C6 [BYTE1 (K [5 ])]; +L [3 ] ^=C7 [BYTE0 (K [4 ])]; + +L [4 ] =C0 [BYTE7 (K [4 ])]; +L [4 ] ^=C1 [BYTE6 (K [3 ])]; +L [4 ] ^=C2 [BYTE5 (K [2 ])]; +L [4 ] ^=C3 [BYTE4 (K [1 ])]; +L [4 ] ^=C4 [BYTE3 (K [0 ])]; +L [4 ] ^=C5 [BYTE2 (K [7 ])]; +L [4 ] ^=C6 [BYTE1 (K [6 ])]; +L [4 ] ^=C7 [BYTE0 (K [5 ])]; + +L [5 ] =C0 [BYTE7 (K [5 ])]; +L [5 ] ^=C1 [BYTE6 (K [4 ])]; +L [5 ] ^=C2 [BYTE5 (K [3 ])]; +L [5 ] ^=C3 [BYTE4 (K [2 ])]; +L [5 ] ^=C4 [BYTE3 (K [1 ])]; +L [5 ] ^=C5 [BYTE2 (K [0 ])]; +L [5 ] ^=C6 [BYTE1 (K [7 ])]; +L [5 ] ^=C7 [BYTE0 (K [6 ])]; + +L [6 ] =C0 [BYTE7 (K [6 ])]; +L [6 ] ^=C1 [BYTE6 (K [5 ])]; +L [6 ] ^=C2 [BYTE5 (K [4 ])]; +L [6 ] ^=C3 [BYTE4 (K [3 ])]; +L [6 ] ^=C4 [BYTE3 (K [2 ])]; +L [6 ] ^=C5 [BYTE2 (K [1 ])]; +L [6 ] ^=C6 [BYTE1 (K [0 ])]; +L [6 ] ^=C7 [BYTE0 (K [7 ])]; + +L [7 ] =C0 [BYTE7 (K [7 ])]; +L [7 ] ^=C1 [BYTE6 (K [6 ])]; +L [7 ] ^=C2 [BYTE5 (K [5 ])]; +L [7 ] ^=C3 [BYTE4 (K [4 ])]; +L [7 ] ^=C4 [BYTE3 (K [3 ])]; +L [7 ] ^=C5 [BYTE2 (K [2 ])]; +L [7 ] ^=C6 [BYTE1 (K [1 ])]; +L [7 ] ^=C7 [BYTE0 (K [0 ])];K [0 ] =L [0 ];K [1 ] =L [1 ];
@@ -877,85 +881,85 @@ static void wp512_process_buffer(structK [6 ] =L [6 ];K [7 ] =L [7 ]; -L [0 ] =C0 [(int )(state[0 ] >>56 ) ] ^ -C1 [(int )(state[7 ] >>48 ) &0xff ] ^ -C2 [(int )(state[6 ] >>40 ) &0xff ] ^ -C3 [(int )(state[5 ] >>32 ) &0xff ] ^ -C4 [(int )(state[4 ] >>24 ) &0xff ] ^ -C5 [(int )(state[3 ] >>16 ) &0xff ] ^ -C6 [(int )(state[2 ] >>8 ) &0xff ] ^ -C7 [(int )(state[1 ] ) &0xff ] ^ -K [0 ]; - -L [1 ] =C0 [(int )(state[1 ] >>56 ) ] ^ -C1 [(int )(state[0 ] >>48 ) &0xff ] ^ -C2 [(int )(state[7 ] >>40 ) &0xff ] ^ -C3 [(int )(state[6 ] >>32 ) &0xff ] ^ -C4 [(int )(state[5 ] >>24 ) &0xff ] ^ -C5 [(int )(state[4 ] >>16 ) &0xff ] ^ -C6 [(int )(state[3 ] >>8 ) &0xff ] ^ -C7 [(int )(state[2 ] ) &0xff ] ^ -K [1 ]; - -L [2 ] =C0 [(int )(state[2 ] >>56 ) ] ^ -C1 [(int )(state[1 ] >>48 ) &0xff ] ^ -C2 [(int )(state[0 ] >>40 ) &0xff ] ^ -C3 [(int )(state[7 ] >>32 ) &0xff ] ^ -C4 [(int )(state[6 ] >>24 ) &0xff ] ^ -C5 [(int )(state[5 ] >>16 ) &0xff ] ^ -C6 [(int )(state[4 ] >>8 ) &0xff ] ^ -C7 [(int )(state[3 ] ) &0xff ] ^ -K [2 ]; - -L [3 ] =C0 [(int )(state[3 ] >>56 ) ] ^ -C1 [(int )(state[2 ] >>48 ) &0xff ] ^ -C2 [(int )(state[1 ] >>40 ) &0xff ] ^ -C3 [(int )(state[0 ] >>32 ) &0xff ] ^ -C4 [(int )(state[7 ] >>24 ) &0xff ] ^ -C5 [(int )(state[6 ] >>16 ) &0xff ] ^ -C6 [(int )(state[5 ] >>8 ) &0xff ] ^ -C7 [(int )(state[4 ] ) &0xff ] ^ -K [3 ]; - -L [4 ] =C0 [(int )(state[4 ] >>56 ) ] ^ -C1 [(int )(state[3 ] >>48 ) &0xff ] ^ -C2 [(int )(state[2 ] >>40 ) &0xff ] ^ -C3 [(int )(state[1 ] >>32 ) &0xff ] ^ -C4 [(int )(state[0 ] >>24 ) &0xff ] ^ -C5 [(int )(state[7 ] >>16 ) &0xff ] ^ -C6 [(int )(state[6 ] >>8 ) &0xff ] ^ -C7 [(int )(state[5 ] ) &0xff ] ^ -K [4 ]; - -L [5 ] =C0 [(int )(state[5 ] >>56 ) ] ^ -C1 [(int )(state[4 ] >>48 ) &0xff ] ^ -C2 [(int )(state[3 ] >>40 ) &0xff ] ^ -C3 [(int )(state[2 ] >>32 ) &0xff ] ^ -C4 [(int )(state[1 ] >>24 ) &0xff ] ^ -C5 [(int )(state[0 ] >>16 ) &0xff ] ^ -C6 [(int )(state[7 ] >>8 ) &0xff ] ^ -C7 [(int )(state[6 ] ) &0xff ] ^ -K [5 ]; - -L [6 ] =C0 [(int )(state[6 ] >>56 ) ] ^ -C1 [(int )(state[5 ] >>48 ) &0xff ] ^ -C2 [(int )(state[4 ] >>40 ) &0xff ] ^ -C3 [(int )(state[3 ] >>32 ) &0xff ] ^ -C4 [(int )(state[2 ] >>24 ) &0xff ] ^ -C5 [(int )(state[1 ] >>16 ) &0xff ] ^ -C6 [(int )(state[0 ] >>8 ) &0xff ] ^ -C7 [(int )(state[7 ] ) &0xff ] ^ -K [6 ]; - -L [7 ] =C0 [(int )(state[7 ] >>56 ) ] ^ -C1 [(int )(state[6 ] >>48 ) &0xff ] ^ -C2 [(int )(state[5 ] >>40 ) &0xff ] ^ -C3 [(int )(state[4 ] >>32 ) &0xff ] ^ -C4 [(int )(state[3 ] >>24 ) &0xff ] ^ -C5 [(int )(state[2 ] >>16 ) &0xff ] ^ -C6 [(int )(state[1 ] >>8 ) &0xff ] ^ -C7 [(int )(state[0 ] ) &0xff ] ^ -K [7 ]; +L [0 ] =C0 [BYTE7 (state[0 ])]; +L [0 ] ^=C1 [BYTE6 (state[7 ])]; +L [0 ] ^=C2 [BYTE5 (state[6 ])]; +L [0 ] ^=C3 [BYTE4 (state[5 ])]; +L [0 ] ^=C4 [BYTE3 (state[4 ])]; +L [0 ] ^=C5 [BYTE2 (state[3 ])]; +L [0 ] ^=C6 [BYTE1 (state[2 ])]; +L [0 ] ^=C7 [BYTE0 (state[1 ])]; +L [0 ] ^=K [0 ]; + +L [1 ] =C0 [BYTE7 (state[1 ])]; +L [1 ] ^=C1 [BYTE6 (state[0 ])]; +L [1 ] ^=C2 [BYTE5 (state[7 ])]; +L [1 ] ^=C3 [BYTE4 (state[6 ])]; +L [1 ] ^=C4 [BYTE3 (state[5 ])]; +L [1 ] ^=C5 [BYTE2 (state[4 ])]; +L [1 ] ^=C6 [BYTE1 (state[3 ])]; +L [1 ] ^=C7 [BYTE0 (state[2 ])]; +L [1 ] ^=K [1 ]; + +L [2 ] =C0 [BYTE7 (state[2 ])]; +L [2 ] ^=C1 [BYTE6 (state[1 ])]; +L [2 ] ^=C2 [BYTE5 (state[0 ])]; +L [2 ] ^=C3 [BYTE4 (state[7 ])]; +L [2 ] ^=C4 [BYTE3 (state[6 ])]; +L [2 ] ^=C5 [BYTE2 (state[5 ])]; +L [2 ] ^=C6 [BYTE1 (state[4 ])]; +L [2 ] ^=C7 [BYTE0 (state[3 ])]; +L [2 ] ^=K [2 ]; + +L [3 ] =C0 [BYTE7 (state[3 ])]; +L [3 ] ^=C1 [BYTE6 (state[2 ])]; +L [3 ] ^=C2 [BYTE5 (state[1 ])]; +L [3 ] ^=C3 [BYTE4 (state[0 ])]; +L [3 ] ^=C4 [BYTE3 (state[7 ])]; +L [3 ] ^=C5 [BYTE2 (state[6 ])]; +L [3 ] ^=C6 [BYTE1 (state[5 ])]; +L [3 ] ^=C7 [BYTE0 (state[4 ])]; +L [3 ] ^=K [3 ]; + +L [4 ] =C0 [BYTE7 (state[4 ])]; +L [4 ] ^=C1 [BYTE6 (state[3 ])]; +L [4 ] ^=C2 [BYTE5 (state[2 ])]; +L [4 ] ^=C3 [BYTE4 (state[1 ])]; +L [4 ] ^=C4 [BYTE3 (state[0 ])]; +L [4 ] ^=C5 [BYTE2 (state[7 ])]; +L [4 ] ^=C6 [BYTE1 (state[6 ])]; +L [4 ] ^=C7 [BYTE0 (state[5 ])]; +L [4 ] ^=K [4 ]; + +L [5 ] =C0 [BYTE7 (state[5 ])]; +L [5 ] ^=C1 [BYTE6 (state[4 ])]; +L [5 ] ^=C2 [BYTE5 (state[3 ])]; +L [5 ] ^=C3 [BYTE4 (state[2 ])]; +L [5 ] ^=C4 [BYTE3 (state[1 ])]; +L [5 ] ^=C5 [BYTE2 (state[0 ])]; +L [5 ] ^=C6 [BYTE1 (state[7 ])]; +L [5 ] ^=C7 [BYTE0 (state[6 ])]; +L [5 ] ^=K [5 ]; + +L [6 ] =C0 [BYTE7 (state[6 ])]; +L [6 ] ^=C1 [BYTE6 (state[5 ])]; +L [6 ] ^=C2 [BYTE5 (state[4 ])]; +L [6 ] ^=C3 [BYTE4 (state[3 ])]; +L [6 ] ^=C4 [BYTE3 (state[2 ])]; +L [6 ] ^=C5 [BYTE2 (state[1 ])]; +L [6 ] ^=C6 [BYTE1 (state[0 ])]; +L [6 ] ^=C7 [BYTE0 (state[7 ])]; +L [6 ] ^=K [6 ]; + +L [7 ] =C0 [BYTE7 (state[7 ])]; +L [7 ] ^=C1 [BYTE6 (state[6 ])]; +L [7 ] ^=C2 [BYTE5 (state[5 ])]; +L [7 ] ^=C3 [BYTE4 (state[4 ])]; +L [7 ] ^=C4 [BYTE3 (state[3 ])]; +L [7 ] ^=C5 [BYTE2 (state[2 ])]; +L [7 ] ^=C6 [BYTE1 (state[1 ])]; +L [7 ] ^=C7 [BYTE0 (state[0 ])]; +L [7 ] ^=K [7 ]; state[0 ] =L [0 ]; state[1 ] =L [1 ];
PATCH 3/4 twofish on diet
In reply to Denis Vlasenkoreduce tf module size by x2.5: it was unrolled too much.
crypto/twofish.c +85 -115
@@ -532,88 +532,95 @@ static const u8 calc_sb_tbl[512] = {* key byte to use. CALC_K256 is identical to CALC_K but for using the * CALC_K256_2 macro instead of CALC_K_2. */ -#define CALC_K_2 (a, b, c, d, j) \ - mds[0][q0[a ^ key[(j) + 8]] ^ key[j]] \ - ^ mds[1][q0[b ^ key[(j) + 9]] ^ key[(j) + 1]] \ - ^ mds[2][q1[c ^ key[(j) + 10]] ^ key[(j) + 2]] \ - ^ mds[3][q1[d ^ key[(j) + 11]] ^ key[(j) + 3]] +#define CALC_K_2 (a, b, c, d, j) ( \ + mds[0][q0[(a) ^ key[(j) + 8]] ^ key[j]] \ + ^ mds[1][q0[(b) ^ key[(j) + 9]] ^ key[(j) + 1]] \ + ^ mds[2][q1[(c) ^ key[(j) + 10]] ^ key[(j) + 2]] \ + ^ mds[3][q1[(d) ^ key[(j) + 11]] ^ key[(j) + 3]] \ +) -#define CALC_K (a, j, k, l, m, n) \ +#define CALC_K (a, j, k, l, m, n) { \ x = CALC_K_2 (k, l, k, l, 0); \ y = CALC_K_2 (m, n, m, n, 4); \ y = rol32(y, 8); \ - x += y; y += x; ctx->a[j] = x; \ - ctx->a[(j) + 1] = rol32(y, 9) + x += y; y += x; \ + ctx->a[j] = x; \ + ctx->a[(j) + 1] = rol32(y, 9); \ +}#define CALC_K192_2 (a, b, c, d, j) \ - CALC_K_2 (q0[a ^ key[(j) + 16]], \ - q1[b ^ key[(j) + 17]], \ - q0[c ^ key[(j) + 18]], \ - q1[d ^ key[(j) + 19]], j) + CALC_K_2 (q0[(a) ^ key[(j) + 16]], \ + q1[(b) ^ key[(j) + 17]], \ + q0[(c) ^ key[(j) + 18]], \ + q1[(d) ^ key[(j) + 19]], (j)) -#define CALC_K192 (a, j, k, l, m, n) \ +#define CALC_K192 (a, j, k, l, m, n) { \ x = CALC_K192_2 (l, l, k, k, 0); \ y = CALC_K192_2 (n, n, m, m, 4); \ y = rol32(y, 8); \ - x += y; y += x; ctx->a[j] = x; \ - ctx->a[(j) + 1] = rol32(y, 9) + x += y; y += x; \ + ctx->a[j] = x; \ + ctx->a[(j) + 1] = rol32(y, 9); \ +}#define CALC_K256_2 (a, b, j) \ - CALC_K192_2 (q1[b ^ key[(j) + 24]], \ - q1[a ^ key[(j) + 25]], \ - q0[a ^ key[(j) + 26]], \ - q0[b ^ key[(j) + 27]], j) + CALC_K192_2 (q1[(b) ^ key[(j) + 24]], \ + q1[(a) ^ key[(j) + 25]], \ + q0[(a) ^ key[(j) + 26]], \ + q0[(b) ^ key[(j) + 27]], (j)) -#define CALC_K256 (a, j, k, l, m, n) \ +#define CALC_K256 (a, j, k, l, m, n) { \ x = CALC_K256_2 (k, l, 0); \ y = CALC_K256_2 (m, n, 4); \ y = rol32(y, 8); \ - x += y; y += x; ctx->a[j] = x; \ - ctx->a[(j) + 1] = rol32(y, 9) - + x += y; y += x; \ + ctx->a[j] = x; \ + ctx->a[(j) + 1] = rol32(y, 9); \ +}/* Macros to compute the g() function in the encryption and decryption * rounds. G1 is the straight g() function; G2 includes the 8-bit * rotation for the high 32-bit word. */ -#define G1 (a) \ - (ctx->s[0][(a) & 0xFF]) ^ (ctx->s[1][((a) >> 8) & 0xFF]) \ - ^ (ctx->s[2][((a) >> 16) & 0xFF]) ^ (ctx->s[3][(a) >> 24]) - -#define G2 (b) \ - (ctx->s[1][(b) & 0xFF]) ^ (ctx->s[2][((b) >> 8) & 0xFF]) \ - ^ (ctx->s[3][((b) >> 16) & 0xFF]) ^ (ctx->s[0][(b) >> 24]) +#define G1 (a) ( \ + (ctx->s[0][BYTE0(a)]) ^ (ctx->s[1][BYTE1(a)]) \ + ^ (ctx->s[2][BYTE2(a)]) ^ (ctx->s[3][BYTE3(a)]) \ +) + +#define G2 (b) ( \ + (ctx->s[1][BYTE0(b)]) ^ (ctx->s[2][BYTE1(b)]) \ + ^ (ctx->s[3][BYTE2(b)]) ^ (ctx->s[0][BYTE3(b)]) \ +)/* Encryption and decryption Feistel rounds. Each one calls the two g() * macros, does the PHT, and performs the XOR and the appropriate bit * rotations. The parameters are the round number (used to select subkeys), * and the four 32-bit chunks of the text. */ -#define ENCROUND (n, a, b, c, d) \ - x = G1 (a); y = G2 (b); \ - x += y; y += x + ctx->k[2 * (n) + 1]; \ - (c) ^= x + ctx->k[2 * (n)]; \ - (c) = ((c) >> 1) + ((c) << 31); \ - (d) = (((d) << 1)+((d) >> 31)) ^ y +#define ENCROUND (n, a, b, c, d) { \ + y = G2 (b); x = y + G1 (a); y += x; \ + (c) = ror32((c) ^ (x + ctx->k[2 * (n)]), 1); \ + (d) = rol32((d), 1) ^ (y + ctx->k[2 * (n) + 1]); \ +} -#define DECROUND (n, a, b, c, d) \ - x = G1 (a); y = G2 (b); \ - x += y; y += x; \ - (d) ^= y + ctx->k[2 * (n) + 1]; \ - (d) = ((d) >> 1) + ((d) << 31); \ - (c) = (((c) << 1)+((c) >> 31)); \ - (c) ^= (x + ctx->k[2 * (n)]) +#define DECROUND (n, a, b, c, d) { \ + y = G2 (b); x = y + G1 (a); y += x; \ + (d) = ror32((d) ^ (y + ctx->k[2 * (n) + 1]), 1); \ + (c) = rol32((c), 1) ^ (x + ctx->k[2 * (n)]); \ +}/* Encryption and decryption cycles; each one is simply two Feistel rounds * with the 32-bit chunks re-ordered to simulate the "swap" */ -#define ENCCYCLE (n) \ +#define ENCCYCLE (n) { \ ENCROUND (2 * (n), a, b, c, d); \ - ENCROUND (2 * (n) + 1, c, d, a, b) + ENCROUND (2 * (n) + 1, c, d, a, b); \ +} -#define DECCYCLE (n) \ +#define DECCYCLE (n) { \ DECROUND (2 * (n) + 1, c, d, a, b); \ - DECROUND (2 * (n), a, b, c, d) + DECROUND (2 * (n), a, b, c, d); \ +}/* Macros to convert the input and output bytes into 32-bit words, * and simultaneously perform the whitening step. INPACK packs word
@@ -718,84 +725,47 @@ static int twofish_setkey(void *cx, consCALC_SB256_2 ( i, calc_sb_tbl[j], calc_sb_tbl[k] ); } -/* Calculate whitening and round subkeys. The constants are -* indices of subkeys, preprocessed through q0 and q1. */ -CALC_K256 (w,0 ,0xA9 ,0x75 ,0x67 ,0xF3 ); -CALC_K256 (w,2 ,0xB3 ,0xC6 ,0xE8 ,0xF4 ); -CALC_K256 (w,4 ,0x04 ,0xDB ,0xFD ,0x7B ); -CALC_K256 (w,6 ,0xA3 ,0xFB ,0x76 ,0xC8 ); -CALC_K256 (k,0 ,0x9A ,0x4A ,0x92 ,0xD3 ); -CALC_K256 (k,2 ,0x80 ,0xE6 ,0x78 ,0x6B ); -CALC_K256 (k,4 ,0xE4 ,0x45 ,0xDD ,0x7D ); -CALC_K256 (k,6 ,0xD1 ,0xE8 ,0x38 ,0x4B ); -CALC_K256 (k,8 ,0x0D ,0xD6 ,0xC6 ,0x32 ); -CALC_K256 (k,10 ,0x35 ,0xD8 ,0x98 ,0xFD ); -CALC_K256 (k,12 ,0x18 ,0x37 ,0xF7 ,0x71 ); -CALC_K256 (k,14 ,0xEC ,0xF1 ,0x6C ,0xE1 ); -CALC_K256 (k,16 ,0x43 ,0x30 ,0x75 ,0x0F ); -CALC_K256 (k,18 ,0x37 ,0xF8 ,0x26 ,0x1B ); -CALC_K256 (k,20 ,0xFA ,0x87 ,0x13 ,0xFA ); -CALC_K256 (k,22 ,0x94 ,0x06 ,0x48 ,0x3F ); -CALC_K256 (k,24 ,0xF2 ,0x5E ,0xD0 ,0xBA ); -CALC_K256 (k,26 ,0x8B ,0xAE ,0x30 ,0x5B ); -CALC_K256 (k,28 ,0x84 ,0x8A ,0x54 ,0x00 ); -CALC_K256 (k,30 ,0xDF ,0xBC ,0x23 ,0x9D ); +/* We do not unroll loops with CALC_Knnn macros: this would cost +** x2.5 code size (+18k on i386) but would give only +7% speed: +** unrolled: twofish_setkey/sec: 41128 +** loop: twofish_setkey/sec: 38148 +** CALC_K256: ~100 insns each +** CALC_K192: ~90 insns +** CALC_K: ~70 insns +*/ +/* Calculate whitening and round subkeys */ +for ( i =0 ; i <8 ; i +=2 ) { +CALC_K256 (w, i, q0[i], q1[i], q0[i+1 ], q1[i+1 ]); + } +for ( i =0 ; i <32 ; i +=2 ) { +CALC_K256 (k, i, q0[i+8 ], q1[i+8 ], q0[i+9 ], q1[i+9 ]); + } }else if (key_len ==24 ) {/* 192-bit key */ /* Compute the S-boxes. */ for ( i = j =0 , k =1 ; i <256 ; i++, j +=2 , k +=2 ) {CALC_SB192_2 ( i, calc_sb_tbl[j], calc_sb_tbl[k] ); } -/* Calculate whitening and round subkeys. The constants are -* indices of subkeys, preprocessed through q0 and q1. */ -CALC_K192 (w,0 ,0xA9 ,0x75 ,0x67 ,0xF3 ); -CALC_K192 (w,2 ,0xB3 ,0xC6 ,0xE8 ,0xF4 ); -CALC_K192 (w,4 ,0x04 ,0xDB ,0xFD ,0x7B ); -CALC_K192 (w,6 ,0xA3 ,0xFB ,0x76 ,0xC8 ); -CALC_K192 (k,0 ,0x9A ,0x4A ,0x92 ,0xD3 ); -CALC_K192 (k,2 ,0x80 ,0xE6 ,0x78 ,0x6B ); -CALC_K192 (k,4 ,0xE4 ,0x45 ,0xDD ,0x7D ); -CALC_K192 (k,6 ,0xD1 ,0xE8 ,0x38 ,0x4B ); -CALC_K192 (k,8 ,0x0D ,0xD6 ,0xC6 ,0x32 ); -CALC_K192 (k,10 ,0x35 ,0xD8 ,0x98 ,0xFD ); -CALC_K192 (k,12 ,0x18 ,0x37 ,0xF7 ,0x71 ); -CALC_K192 (k,14 ,0xEC ,0xF1 ,0x6C ,0xE1 ); -CALC_K192 (k,16 ,0x43 ,0x30 ,0x75 ,0x0F ); -CALC_K192 (k,18 ,0x37 ,0xF8 ,0x26 ,0x1B ); -CALC_K192 (k,20 ,0xFA ,0x87 ,0x13 ,0xFA ); -CALC_K192 (k,22 ,0x94 ,0x06 ,0x48 ,0x3F ); -CALC_K192 (k,24 ,0xF2 ,0x5E ,0xD0 ,0xBA ); -CALC_K192 (k,26 ,0x8B ,0xAE ,0x30 ,0x5B ); -CALC_K192 (k,28 ,0x84 ,0x8A ,0x54 ,0x00 ); -CALC_K192 (k,30 ,0xDF ,0xBC ,0x23 ,0x9D ); +/* Calculate whitening and round subkeys */ +for ( i =0 ; i <8 ; i +=2 ) { +CALC_K192 (w, i, q0[i], q1[i], q0[i+1 ], q1[i+1 ]); + } +for ( i =0 ; i <32 ; i +=2 ) { +CALC_K192 (k, i, q0[i+8 ], q1[i+8 ], q0[i+9 ], q1[i+9 ]); + } }else {/* 128-bit key */ /* Compute the S-boxes. */ for ( i = j =0 , k =1 ; i <256 ; i++, j +=2 , k +=2 ) {CALC_SB_2 ( i, calc_sb_tbl[j], calc_sb_tbl[k] ); } -/* Calculate whitening and round subkeys. The constants are -* indices of subkeys, preprocessed through q0 and q1. */ -CALC_K (w,0 ,0xA9 ,0x75 ,0x67 ,0xF3 ); -CALC_K (w,2 ,0xB3 ,0xC6 ,0xE8 ,0xF4 ); -CALC_K (w,4 ,0x04 ,0xDB ,0xFD ,0x7B ); -CALC_K (w,6 ,0xA3 ,0xFB ,0x76 ,0xC8 ); -CALC_K (k,0 ,0x9A ,0x4A ,0x92 ,0xD3 ); -CALC_K (k,2 ,0x80 ,0xE6 ,0x78 ,0x6B ); -CALC_K (k,4 ,0xE4 ,0x45 ,0xDD ,0x7D ); -CALC_K (k,6 ,0xD1 ,0xE8 ,0x38 ,0x4B ); -CALC_K (k,8 ,0x0D ,0xD6 ,0xC6 ,0x32 ); -CALC_K (k,10 ,0x35 ,0xD8 ,0x98 ,0xFD ); -CALC_K (k,12 ,0x18 ,0x37 ,0xF7 ,0x71 ); -CALC_K (k,14 ,0xEC ,0xF1 ,0x6C ,0xE1 ); -CALC_K (k,16 ,0x43 ,0x30 ,0x75 ,0x0F ); -CALC_K (k,18 ,0x37 ,0xF8 ,0x26 ,0x1B ); -CALC_K (k,20 ,0xFA ,0x87 ,0x13 ,0xFA ); -CALC_K (k,22 ,0x94 ,0x06 ,0x48 ,0x3F ); -CALC_K (k,24 ,0xF2 ,0x5E ,0xD0 ,0xBA ); -CALC_K (k,26 ,0x8B ,0xAE ,0x30 ,0x5B ); -CALC_K (k,28 ,0x84 ,0x8A ,0x54 ,0x00 ); -CALC_K (k,30 ,0xDF ,0xBC ,0x23 ,0x9D ); +/* Calculate whitening and round subkeys */ +for ( i =0 ; i <8 ; i +=2 ) { +CALC_K (w, i, q0[i], q1[i], q0[i+1 ], q1[i+1 ]); + } +for ( i =0 ; i <32 ; i +=2 ) { +CALC_K (k, i, q0[i+8 ], q1[i+8 ], q0[i+9 ], q1[i+9 ]); + } }return 0 ;
@@ -819,7 +789,7 @@ static void twofish_encrypt(void *cx, u8INPACK (3 , d,3 );/* Encryption Feistel cycles. */ -ENCCYCLE (0 ); +ENCCYCLE (0 );/* ~70 insns each */ ENCCYCLE (1 );ENCCYCLE (2 );ENCCYCLE (3 );
@@ -854,7 +824,7 @@ static void twofish_decrypt(void *cx, u8INPACK (3 , b,7 );/* Encryption Feistel cycles. */ -DECCYCLE (7 ); +DECCYCLE (7 );/* ~70 insns each */ DECCYCLE (6 );DECCYCLE (5 );DECCYCLE (4 );
PATCH 4/4 64 bit rotation
In reply to Denis Vlasenkowe have rol/r32, why not rol/r64?
Add generic 64 rotation and i386 optimized one.
Use it in ia64 and sha512.
--
vda
arch/ia64/kernel/ptrace.c +2 -2
@@ -81,7 +81,7 @@ ia64_get_scratch_nat_bits (struct pt_reg dist =64 + bit - first; \ else \ dist = bit - first; \ -ia64_rotr (unat, dist) & mask; \ +ror64 (unat, dist) & mask; \ })unsigned long val;
@@ -120,7 +120,7 @@ ia64_put_scratch_nat_bits (struct pt_reg dist =64 + bit - first; \ else \ dist = bit - first; \ -ia64_rotl (nat & mask, dist); \ +rol64 (nat & mask, dist); \ })unsigned long scratch_unat;
crypto/sha512.c +4 -9
@@ -45,11 +45,6 @@ static inline u64 Maj(u64 x, u64 y, u64return (x & y) | (z & (x | y)); } -static inline u64 RORu64 (u64 x,u64 y) -{ -return (x >> y) | (x << (64 - y)); -} -static const u64 sha512_K[80 ] = {0x428a2f98d728ae22ULL ,0x7137449123ef65cdULL ,0xb5c0fbcfec4d3b2fULL ,0xe9b5dba58189dbbcULL ,0x3956c25bf348b538ULL ,0x59f111f1b605d019ULL ,
@@ -80,10 +75,10 @@ static const u64 sha512_K[80] = { 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL, }; -#define e0 (x) (RORu64(x,28) ^ RORu64(x,34) ^ RORu64(x,39)) -#define e1 (x) (RORu64(x,14) ^ RORu64(x,18) ^ RORu64(x,41)) -#define s0 (x) (RORu64(x, 1) ^ RORu64(x, 8) ^ (x >> 7)) -#define s1 (x) (RORu64(x,19) ^ RORu64(x,61) ^ (x >> 6)) +#define e0 (x) (ror64(x,28) ^ ror64(x,34) ^ ror64(x,39)) +#define e1 (x) (ror64(x,14) ^ ror64(x,18) ^ ror64(x,41)) +#define s0 (x) (ror64(x, 1) ^ ror64(x, 8) ^ (x >> 7)) +#define s1 (x) (ror64(x,19) ^ ror64(x,61) ^ (x >> 6))/* H* initial state for SHA-512 */ #define H0 0x6a09e667f3bcc908ULL
include/asm-i386/bitops.h +95 -22
248 lines not on this page · raw message
include/asm-ia64/processor.h +0 -8
@@ -654,14 +654,6 @@ ia64_get_dbr (__u64 regnum)return retval; } -static inline __u64 -ia64_rotr (__u64 w,__u64 n) -{ -return (w >> n) | (w << (64 - n)); -} - -#define ia64_rotl (w,n) ia64_rotr((w), (64) - (n)) -/* * Take a mapped kernel address and return the equivalent address * in the region 7 identity mapped virtual area.
include/linux/bitops.h +34 -8
92 lines not on this page · raw message