z.patch
PATCH 5/5 z.patch
crypto/anubis.c +64 -64
@@ -496,31 +496,31 @@ static int anubis_setkey(void *ctx_arg,/* * generate r-th round key K^r: */ -K0 =T4 [(kappa[N -1 ] >>24 ) ]; -K1 =T4 [(kappa[N -1 ] >>16 ) &0xff ]; -K2 =T4 [(kappa[N -1 ] >>8 ) &0xff ]; -K3 =T4 [(kappa[N -1 ] ) &0xff ]; +K0 =T4 [BYTE3 (kappa[N -1 ])]; +K1 =T4 [BYTE2 (kappa[N -1 ])]; +K2 =T4 [BYTE1 (kappa[N -1 ])]; +K3 =T4 [BYTE0 (kappa[N -1 ])];for (i =N -2 ; i >=0 ; i--) { -K0 =T4 [(kappa[i] >>24 ) ] ^ - (T5 [(K0 >>24 ) ] &0xff000000U ) ^ - (T5 [(K0 >>16 ) &0xff ] &0x00ff0000U ) ^ - (T5 [(K0 >>8 ) &0xff ] &0x0000ff00U ) ^ - (T5 [(K0 ) &0xff ] &0x000000ffU ); -K1 =T4 [(kappa[i] >>16 ) &0xff ] ^ - (T5 [(K1 >>24 ) ] &0xff000000U ) ^ - (T5 [(K1 >>16 ) &0xff ] &0x00ff0000U ) ^ - (T5 [(K1 >>8 ) &0xff ] &0x0000ff00U ) ^ - (T5 [(K1 ) &0xff ] &0x000000ffU ); -K2 =T4 [(kappa[i] >>8 ) &0xff ] ^ - (T5 [(K2 >>24 ) ] &0xff000000U ) ^ - (T5 [(K2 >>16 ) &0xff ] &0x00ff0000U ) ^ - (T5 [(K2 >>8 ) &0xff ] &0x0000ff00U ) ^ - (T5 [(K2 ) &0xff ] &0x000000ffU ); -K3 =T4 [(kappa[i] ) &0xff ] ^ - (T5 [(K3 >>24 ) ] &0xff000000U ) ^ - (T5 [(K3 >>16 ) &0xff ] &0x00ff0000U ) ^ - (T5 [(K3 >>8 ) &0xff ] &0x0000ff00U ) ^ - (T5 [(K3 ) &0xff ] &0x000000ffU ); +K0 =T4 [BYTE3 (kappa[i])] ^ + (T5 [BYTE3 (K0 )] &0xff000000U ) ^ + (T5 [BYTE2 (K0 )] &0x00ff0000U ) ^ + (T5 [BYTE1 (K0 )] &0x0000ff00U ) ^ + (T5 [BYTE0 (K0 )] &0x000000ffU ); +K1 =T4 [BYTE2 (kappa[i])] ^ + (T5 [BYTE3 (K1 )] &0xff000000U ) ^ + (T5 [BYTE2 (K1 )] &0x00ff0000U ) ^ + (T5 [BYTE1 (K1 )] &0x0000ff00U ) ^ + (T5 [BYTE0 (K1 )] &0x000000ffU ); +K2 =T4 [BYTE1 (kappa[i])] ^ + (T5 [BYTE3 (K2 )] &0xff000000U ) ^ + (T5 [BYTE2 (K2 )] &0x00ff0000U ) ^ + (T5 [BYTE1 (K2 )] &0x0000ff00U ) ^ + (T5 [BYTE0 (K2 )] &0x000000ffU ); +K3 =T4 [BYTE0 (kappa[i])] ^ + (T5 [BYTE3 (K3 )] &0xff000000U ) ^ + (T5 [BYTE2 (K3 )] &0x00ff0000U ) ^ + (T5 [BYTE1 (K3 )] &0x0000ff00U ) ^ + (T5 [BYTE0 (K3 )] &0x000000ffU ); } ctx->E[r][0 ] =K0 ;
@@ -536,13 +536,13 @@ static int anubis_setkey(void *ctx_arg, }for (i =0 ; i <N ; i++) {int j = i; - inter[i] =T0 [(kappa[j--] >>24 ) ]; + inter[i] =T0 [BYTE3 (kappa[j--])];if (j <0 ) j =N -1 ; - inter[i] ^=T1 [(kappa[j--] >>16 ) &0xff ]; + inter[i] ^=T1 [BYTE2 (kappa[j--])];if (j <0 ) j =N -1 ; - inter[i] ^=T2 [(kappa[j--] >>8 ) &0xff ]; + inter[i] ^=T2 [BYTE1 (kappa[j--])];if (j <0 ) j =N -1 ; - inter[i] ^=T3 [(kappa[j ] ) &0xff ]; + inter[i] ^=T3 [BYTE0 (kappa[j ])]; } kappa[0 ] = inter[0 ] ^ rc[r];for (i =1 ; i <N ; i++) {
@@ -562,10 +562,10 @@ static int anubis_setkey(void *ctx_arg,for (i =0 ; i <4 ; i++) {u32 v = ctx->E[R - r][i]; ctx->D[r][i] = -T0 [T4 [(v >>24 ) ] &0xff ] ^ -T1 [T4 [(v >>16 ) &0xff ] &0xff ] ^ -T2 [T4 [(v >>8 ) &0xff ] &0xff ] ^ -T3 [T4 [(v ) &0xff ] &0xff ]; +T0 [BYTE0 (T4 [BYTE3 (v)])] ^ +T1 [BYTE0 (T4 [BYTE2 (v)])] ^ +T2 [BYTE0 (T4 [BYTE1 (v)])] ^ +T3 [BYTE0 (T4 [BYTE0 (v)])]; } }
@@ -593,28 +593,28 @@ static void anubis_crypt(u32 roundKey[ANfor (i =1 ; i <R ; i++) { inter[0 ] = -T0 [(state[0 ] >>24 ) ] ^ -T1 [(state[1 ] >>24 ) ] ^ -T2 [(state[2 ] >>24 ) ] ^ -T3 [(state[3 ] >>24 ) ] ^ +T0 [BYTE3 (state[0 ])] ^ +T1 [BYTE3 (state[1 ])] ^ +T2 [BYTE3 (state[2 ])] ^ +T3 [BYTE3 (state[3 ])] ^ roundKey[i][0 ]; inter[1 ] = -T0 [(state[0 ] >>16 ) &0xff ] ^ -T1 [(state[1 ] >>16 ) &0xff ] ^ -T2 [(state[2 ] >>16 ) &0xff ] ^ -T3 [(state[3 ] >>16 ) &0xff ] ^ +T0 [BYTE2 (state[0 ])] ^ +T1 [BYTE2 (state[1 ])] ^ +T2 [BYTE2 (state[2 ])] ^ +T3 [BYTE2 (state[3 ])] ^ roundKey[i][1 ]; inter[2 ] = -T0 [(state[0 ] >>8 ) &0xff ] ^ -T1 [(state[1 ] >>8 ) &0xff ] ^ -T2 [(state[2 ] >>8 ) &0xff ] ^ -T3 [(state[3 ] >>8 ) &0xff ] ^ +T0 [BYTE1 (state[0 ])] ^ +T1 [BYTE1 (state[1 ])] ^ +T2 [BYTE1 (state[2 ])] ^ +T3 [BYTE1 (state[3 ])] ^ roundKey[i][2 ]; inter[3 ] = -T0 [(state[0 ] ) &0xff ] ^ -T1 [(state[1 ] ) &0xff ] ^ -T2 [(state[2 ] ) &0xff ] ^ -T3 [(state[3 ] ) &0xff ] ^ +T0 [BYTE0 (state[0 ])] ^ +T1 [BYTE0 (state[1 ])] ^ +T2 [BYTE0 (state[2 ])] ^ +T3 [BYTE0 (state[3 ])] ^ roundKey[i][3 ]; state[0 ] = inter[0 ]; state[1 ] = inter[1 ];
@@ -627,28 +627,28 @@ static void anubis_crypt(u32 roundKey[AN*/ inter[0 ] = - (T0 [(state[0 ] >>24 ) ] &0xff000000U ) ^ - (T1 [(state[1 ] >>24 ) ] &0x00ff0000U ) ^ - (T2 [(state[2 ] >>24 ) ] &0x0000ff00U ) ^ - (T3 [(state[3 ] >>24 ) ] &0x000000ffU ) ^ + (T0 [BYTE3 (state[0 ])] &0xff000000U ) ^ + (T1 [BYTE3 (state[1 ])] &0x00ff0000U ) ^ + (T2 [BYTE3 (state[2 ])] &0x0000ff00U ) ^ + (T3 [BYTE3 (state[3 ])] &0x000000ffU ) ^ roundKey[R ][0 ]; inter[1 ] = - (T0 [(state[0 ] >>16 ) &0xff ] &0xff000000U ) ^ - (T1 [(state[1 ] >>16 ) &0xff ] &0x00ff0000U ) ^ - (T2 [(state[2 ] >>16 ) &0xff ] &0x0000ff00U ) ^ - (T3 [(state[3 ] >>16 ) &0xff ] &0x000000ffU ) ^ + (T0 [BYTE2 (state[0 ])] &0xff000000U ) ^ + (T1 [BYTE2 (state[1 ])] &0x00ff0000U ) ^ + (T2 [BYTE2 (state[2 ])] &0x0000ff00U ) ^ + (T3 [BYTE2 (state[3 ])] &0x000000ffU ) ^ roundKey[R ][1 ]; inter[2 ] = - (T0 [(state[0 ] >>8 ) &0xff ] &0xff000000U ) ^ - (T1 [(state[1 ] >>8 ) &0xff ] &0x00ff0000U ) ^ - (T2 [(state[2 ] >>8 ) &0xff ] &0x0000ff00U ) ^ - (T3 [(state[3 ] >>8 ) &0xff ] &0x000000ffU ) ^ + (T0 [BYTE1 (state[0 ])] &0xff000000U ) ^ + (T1 [BYTE1 (state[1 ])] &0x00ff0000U ) ^ + (T2 [BYTE1 (state[2 ])] &0x0000ff00U ) ^ + (T3 [BYTE1 (state[3 ])] &0x000000ffU ) ^ roundKey[R ][2 ]; inter[3 ] = - (T0 [(state[0 ] ) &0xff ] &0xff000000U ) ^ - (T1 [(state[1 ] ) &0xff ] &0x00ff0000U ) ^ - (T2 [(state[2 ] ) &0xff ] &0x0000ff00U ) ^ - (T3 [(state[3 ] ) &0xff ] &0x000000ffU ) ^ + (T0 [BYTE0 (state[0 ])] &0xff000000U ) ^ + (T1 [BYTE0 (state[1 ])] &0x00ff0000U ) ^ + (T2 [BYTE0 (state[2 ])] &0x0000ff00U ) ^ + (T3 [BYTE0 (state[3 ])] &0x000000ffU ) ^ roundKey[R ][3 ];/*
crypto/khazad.c +32 -32
85 lines not on this page · raw message
crypto/tgr192.c +22 -35
93 lines not on this page · raw message
crypto/wp512.c +4 -4
@@ -1018,14 +1018,14 @@ static void wp512_update(void *ctx, consu64 value = bits_len;for (i =31 , carry =0 ; i >=0 && (carry !=0 || value !=0ULL ); i--) { - carry += bitLength[i] + ((u32 )value &0xff ); + carry += bitLength[i] + ((u8 )value); bitLength[i] = (u8 )carry; carry >>=8 ; value >>=8 ; }while (bits_len >8 ) { - b = ((source[sourcePos] << sourceGap) &0xff ) | - ((source[sourcePos +1 ] &0xff ) >> (8 - sourceGap)); + b = ((u8)(source[sourcePos] << sourceGap)) | + (((u8 )source[sourcePos +1 ]) >> (8 - sourceGap)); buffer[bufferPos++] |= (u8)(b >> bufferRem); bufferBits +=8 - bufferRem;if (bufferBits ==WP512_BLOCK_SIZE *8 ) {
@@ -1038,7 +1038,7 @@ static void wp512_update(void *ctx, cons sourcePos++; }if (bits_len >0 ) { - b = (source[sourcePos] << sourceGap) &0xff ; + b = (u8)(source[sourcePos] << sourceGap); buffer[bufferPos] |= b >> bufferRem; }else { b =0 ;