Entropy fixes - remove legacy
PATCH 8/11 Entropy fixes - remove legacy
Remove long-unused MD5 code, unrolled SHA implementations, Linux 2.2 compatibility, and an unused structure.
drivers/char/random.c +1 -278
@@ -226,10 +226,6 @@* * The code for SHA transform was taken from Peter Gutmann's * implementation, which has been placed in the public domain. -* The code for MD5 transform was taken from Colin Plumb's -* implementation, which has been placed in the public domain. -* The MD5 cryptographic checksum was devised by Ronald Rivest, and is -* documented in RFC 1321, "The MD5 Message Digest Algorithm". * * Further background information on this topic may be obtained from * RFC 1750, "Randomness Recommendations for Security", by Donald
@@ -263,7 +259,6 @@#define DEFAULT_POOL_SIZE 512#define SECONDARY_POOL_SIZE 128#define BATCH_ENTROPY_SIZE 256 -#define USE_SHA /* * The minimum number of bits of entropy before we wake up a read on
@@ -375,16 +370,6 @@*/ /* -* Linux 2.2 compatibility -*/ -#ifndef DECLARE_WAITQUEUE -#define DECLARE_WAITQUEUE (WAIT ,PTR ) struct wait_queue WAIT = { PTR, NULL } -#endif -#ifndef DECLARE_WAIT_QUEUE_HEAD -#define DECLARE_WAIT_QUEUE_HEAD (WAIT ) struct wait_queue *WAIT -#endif - -/* * Static global variables */ static struct entropy_store *random_state;/* The default global store */
@@ -797,15 +782,10 @@* cryptographically necessary. */ -#ifdef USE_SHA -#define HASH_BUFFER_SIZE 5#define HASH_EXTRA_SIZE 80#define HASH_TRANSFORM SHATransform -/* Various size/speed tradeoffs are available. Choose 0..3. */ -#define SHA_CODE_SIZE 0 -/* * SHA transform algorithm, taken from code written by Peter Gutmann, * and placed in the public domain.
@@ -840,7 +820,7 @@/* * Do the preliminary expansion of 16 to 80 words. Doing it -* out-of-line line this is faster than doing it in-line on +* out-of-line line like this is faster than doing it in-line on * register-starved machines like the x86, and not really any * slower on real processors. */
@@ -858,11 +838,6 @@E = digest[4 ];/* Heavy mangling, in 4 sub-rounds of 20 iterations each. */ -#if SHA_CODE_SIZE ==0 -/* -* Approximately 50% of the speed of the largest version, but -* takes up 1/16 the space. Saves about 6k on an i386 kernel. -*/ for (i =0 ; i <80 ; i++) {if (i <40 ) {if (i <20 )
@@ -878,139 +853,6 @@TEMP +=ROTL (5 ,A ) +E +W [i];E =D ;D =C ;C =ROTL (30 ,B );B =A ;A =TEMP ; } -#elif SHA_CODE_SIZE ==1 -for (i =0 ; i <20 ; i++) { -TEMP =f1 (B ,C ,D ) +K1 +ROTL (5 ,A ) +E +W [i]; -E =D ;D =C ;C =ROTL (30 ,B );B =A ;A =TEMP ; - } -for (; i <40 ; i++) { -TEMP =f2 (B ,C ,D ) +K2 +ROTL (5 ,A ) +E +W [i]; -E =D ;D =C ;C =ROTL (30 ,B );B =A ;A =TEMP ; - } -for (; i <60 ; i++) { -TEMP =f3 (B ,C ,D ) +K3 +ROTL (5 ,A ) +E +W [i]; -E =D ;D =C ;C =ROTL (30 ,B );B =A ;A =TEMP ; - } -for (; i <80 ; i++) { -TEMP =f4 (B ,C ,D ) +K4 +ROTL (5 ,A ) +E +W [i]; -E =D ;D =C ;C =ROTL (30 ,B );B =A ;A =TEMP ; - } -#elif SHA_CODE_SIZE ==2 -for (i =0 ; i <20 ; i +=5 ) { -subRound (A ,B ,C ,D ,E , f1,K1 ,W [ i ] ); -subRound (E ,A ,B ,C ,D , f1,K1 ,W [ i+1 ] ); -subRound (D ,E ,A ,B ,C , f1,K1 ,W [ i+2 ] ); -subRound (C ,D ,E ,A ,B , f1,K1 ,W [ i+3 ] ); -subRound (B ,C ,D ,E ,A , f1,K1 ,W [ i+4 ] ); - } -for (; i <40 ; i +=5 ) { -subRound (A ,B ,C ,D ,E , f2,K2 ,W [ i ] ); -subRound (E ,A ,B ,C ,D , f2,K2 ,W [ i+1 ] ); -subRound (D ,E ,A ,B ,C , f2,K2 ,W [ i+2 ] ); -subRound (C ,D ,E ,A ,B , f2,K2 ,W [ i+3 ] ); -subRound (B ,C ,D ,E ,A , f2,K2 ,W [ i+4 ] ); - } -for (; i <60 ; i +=5 ) { -subRound (A ,B ,C ,D ,E , f3,K3 ,W [ i ] ); -subRound (E ,A ,B ,C ,D , f3,K3 ,W [ i+1 ] ); -subRound (D ,E ,A ,B ,C , f3,K3 ,W [ i+2 ] ); -subRound (C ,D ,E ,A ,B , f3,K3 ,W [ i+3 ] ); -subRound (B ,C ,D ,E ,A , f3,K3 ,W [ i+4 ] ); - } -for (; i <80 ; i +=5 ) { -subRound (A ,B ,C ,D ,E , f4,K4 ,W [ i ] ); -subRound (E ,A ,B ,C ,D , f4,K4 ,W [ i+1 ] ); -subRound (D ,E ,A ,B ,C , f4,K4 ,W [ i+2 ] ); -subRound (C ,D ,E ,A ,B , f4,K4 ,W [ i+3 ] ); -subRound (B ,C ,D ,E ,A , f4,K4 ,W [ i+4 ] ); - } -#elif SHA_CODE_SIZE ==3 /* Really large version */ -subRound (A ,B ,C ,D ,E , f1,K1 ,W [0 ] ); -subRound (E ,A ,B ,C ,D , f1,K1 ,W [1 ] ); -subRound (D ,E ,A ,B ,C , f1,K1 ,W [2 ] ); -subRound (C ,D ,E ,A ,B , f1,K1 ,W [3 ] ); -subRound (B ,C ,D ,E ,A , f1,K1 ,W [4 ] ); -subRound (A ,B ,C ,D ,E , f1,K1 ,W [5 ] ); -subRound (E ,A ,B ,C ,D , f1,K1 ,W [6 ] ); -subRound (D ,E ,A ,B ,C , f1,K1 ,W [7 ] ); -subRound (C ,D ,E ,A ,B , f1,K1 ,W [8 ] ); -subRound (B ,C ,D ,E ,A , f1,K1 ,W [9 ] ); -subRound (A ,B ,C ,D ,E , f1,K1 ,W [10 ] ); -subRound (E ,A ,B ,C ,D , f1,K1 ,W [11 ] ); -subRound (D ,E ,A ,B ,C , f1,K1 ,W [12 ] ); -subRound (C ,D ,E ,A ,B , f1,K1 ,W [13 ] ); -subRound (B ,C ,D ,E ,A , f1,K1 ,W [14 ] ); -subRound (A ,B ,C ,D ,E , f1,K1 ,W [15 ] ); -subRound (E ,A ,B ,C ,D , f1,K1 ,W [16 ] ); -subRound (D ,E ,A ,B ,C , f1,K1 ,W [17 ] ); -subRound (C ,D ,E ,A ,B , f1,K1 ,W [18 ] ); -subRound (B ,C ,D ,E ,A , f1,K1 ,W [19 ] ); - -subRound (A ,B ,C ,D ,E , f2,K2 ,W [20 ] ); -subRound (E ,A ,B ,C ,D , f2,K2 ,W [21 ] ); -subRound (D ,E ,A ,B ,C , f2,K2 ,W [22 ] ); -subRound (C ,D ,E ,A ,B , f2,K2 ,W [23 ] ); -subRound (B ,C ,D ,E ,A , f2,K2 ,W [24 ] ); -subRound (A ,B ,C ,D ,E , f2,K2 ,W [25 ] ); -subRound (E ,A ,B ,C ,D , f2,K2 ,W [26 ] ); -subRound (D ,E ,A ,B ,C , f2,K2 ,W [27 ] ); -subRound (C ,D ,E ,A ,B , f2,K2 ,W [28 ] ); -subRound (B ,C ,D ,E ,A , f2,K2 ,W [29 ] ); -subRound (A ,B ,C ,D ,E , f2,K2 ,W [30 ] ); -subRound (E ,A ,B ,C ,D , f2,K2 ,W [31 ] ); -subRound (D ,E ,A ,B ,C , f2,K2 ,W [32 ] ); -subRound (C ,D ,E ,A ,B , f2,K2 ,W [33 ] ); -subRound (B ,C ,D ,E ,A , f2,K2 ,W [34 ] ); -subRound (A ,B ,C ,D ,E , f2,K2 ,W [35 ] ); -subRound (E ,A ,B ,C ,D , f2,K2 ,W [36 ] ); -subRound (D ,E ,A ,B ,C , f2,K2 ,W [37 ] ); -subRound (C ,D ,E ,A ,B , f2,K2 ,W [38 ] ); -subRound (B ,C ,D ,E ,A , f2,K2 ,W [39 ] ); - -subRound (A ,B ,C ,D ,E , f3,K3 ,W [40 ] ); -subRound (E ,A ,B ,C ,D , f3,K3 ,W [41 ] ); -subRound (D ,E ,A ,B ,C , f3,K3 ,W [42 ] ); -subRound (C ,D ,E ,A ,B , f3,K3 ,W [43 ] ); -subRound (B ,C ,D ,E ,A , f3,K3 ,W [44 ] ); -subRound (A ,B ,C ,D ,E , f3,K3 ,W [45 ] ); -subRound (E ,A ,B ,C ,D , f3,K3 ,W [46 ] ); -subRound (D ,E ,A ,B ,C , f3,K3 ,W [47 ] ); -subRound (C ,D ,E ,A ,B , f3,K3 ,W [48 ] ); -subRound (B ,C ,D ,E ,A , f3,K3 ,W [49 ] ); -subRound (A ,B ,C ,D ,E , f3,K3 ,W [50 ] ); -subRound (E ,A ,B ,C ,D , f3,K3 ,W [51 ] ); -subRound (D ,E ,A ,B ,C , f3,K3 ,W [52 ] ); -subRound (C ,D ,E ,A ,B , f3,K3 ,W [53 ] ); -subRound (B ,C ,D ,E ,A , f3,K3 ,W [54 ] ); -subRound (A ,B ,C ,D ,E , f3,K3 ,W [55 ] ); -subRound (E ,A ,B ,C ,D , f3,K3 ,W [56 ] ); -subRound (D ,E ,A ,B ,C , f3,K3 ,W [57 ] ); -subRound (C ,D ,E ,A ,B , f3,K3 ,W [58 ] ); -subRound (B ,C ,D ,E ,A , f3,K3 ,W [59 ] ); - -subRound (A ,B ,C ,D ,E , f4,K4 ,W [60 ] ); -subRound (E ,A ,B ,C ,D , f4,K4 ,W [61 ] ); -subRound (D ,E ,A ,B ,C , f4,K4 ,W [62 ] ); -subRound (C ,D ,E ,A ,B , f4,K4 ,W [63 ] ); -subRound (B ,C ,D ,E ,A , f4,K4 ,W [64 ] ); -subRound (A ,B ,C ,D ,E , f4,K4 ,W [65 ] ); -subRound (E ,A ,B ,C ,D , f4,K4 ,W [66 ] ); -subRound (D ,E ,A ,B ,C , f4,K4 ,W [67 ] ); -subRound (C ,D ,E ,A ,B , f4,K4 ,W [68 ] ); -subRound (B ,C ,D ,E ,A , f4,K4 ,W [69 ] ); -subRound (A ,B ,C ,D ,E , f4,K4 ,W [70 ] ); -subRound (E ,A ,B ,C ,D , f4,K4 ,W [71 ] ); -subRound (D ,E ,A ,B ,C , f4,K4 ,W [72 ] ); -subRound (C ,D ,E ,A ,B , f4,K4 ,W [73 ] ); -subRound (B ,C ,D ,E ,A , f4,K4 ,W [74 ] ); -subRound (A ,B ,C ,D ,E , f4,K4 ,W [75 ] ); -subRound (E ,A ,B ,C ,D , f4,K4 ,W [76 ] ); -subRound (D ,E ,A ,B ,C , f4,K4 ,W [77 ] ); -subRound (C ,D ,E ,A ,B , f4,K4 ,W [78 ] ); -subRound (B ,C ,D ,E ,A , f4,K4 ,W [79 ] ); -#else -#error Illegal SHA_CODE_SIZE -#endif /* Build message digest */ digest[0 ] +=A ;
@@ -1033,125 +875,6 @@#undef K3#undef K4#undef subRound - -#else /* !USE_SHA - Use MD5 */ - -#define HASH_BUFFER_SIZE 4 -#define HASH_EXTRA_SIZE 0 -#define HASH_TRANSFORM MD5Transform - -/* -* MD5 transform algorithm, taken from code written by Colin Plumb, -* and put into the public domain -*/ - -/* The four core functions - F1 is optimized somewhat */ - -/* #define F1(x, y, z) (x & y | ~x & z) */ -#define F1 (x, y, z) (z ^ (x & (y ^ z))) -#define F2 (x, y, z) F1(z, x, y) -#define F3 (x, y, z) (x ^ y ^ z) -#define F4 (x, y, z) (y ^ (x | ~z)) - -/* This is the central step in the MD5 algorithm. */ -#define MD5STEP (f, w, x, y, z, data, s) \ - ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x ) - -/* -* The core of the MD5 algorithm, this alters an existing MD5 hash to -* reflect the addition of 16 longwords of new data. MD5Update blocks -* the data and converts bytes into longwords for this routine. -*/ -static void MD5Transform (__u32 buf[HASH_BUFFER_SIZE ],__u32 const in[16 ]) -{ -__u32 a, b, c, d; - - a = buf[0 ]; - b = buf[1 ]; - c = buf[2 ]; - d = buf[3 ]; - -MD5STEP (F1 , a, b, c, d, in[0 ]+0xd76aa478 ,7 ); -MD5STEP (F1 , d, a, b, c, in[1 ]+0xe8c7b756 ,12 ); -MD5STEP (F1 , c, d, a, b, in[2 ]+0x242070db ,17 ); -MD5STEP (F1 , b, c, d, a, in[3 ]+0xc1bdceee ,22 ); -MD5STEP (F1 , a, b, c, d, in[4 ]+0xf57c0faf ,7 ); -MD5STEP (F1 , d, a, b, c, in[5 ]+0x4787c62a ,12 ); -MD5STEP (F1 , c, d, a, b, in[6 ]+0xa8304613 ,17 ); -MD5STEP (F1 , b, c, d, a, in[7 ]+0xfd469501 ,22 ); -MD5STEP (F1 , a, b, c, d, in[8 ]+0x698098d8 ,7 ); -MD5STEP (F1 , d, a, b, c, in[9 ]+0x8b44f7af ,12 ); -MD5STEP (F1 , c, d, a, b, in[10 ]+0xffff5bb1 ,17 ); -MD5STEP (F1 , b, c, d, a, in[11 ]+0x895cd7be ,22 ); -MD5STEP (F1 , a, b, c, d, in[12 ]+0x6b901122 ,7 ); -MD5STEP (F1 , d, a, b, c, in[13 ]+0xfd987193 ,12 ); -MD5STEP (F1 , c, d, a, b, in[14 ]+0xa679438e ,17 ); -MD5STEP (F1 , b, c, d, a, in[15 ]+0x49b40821 ,22 ); - -MD5STEP (F2 , a, b, c, d, in[1 ]+0xf61e2562 ,5 ); -MD5STEP (F2 , d, a, b, c, in[6 ]+0xc040b340 ,9 ); -MD5STEP (F2 , c, d, a, b, in[11 ]+0x265e5a51 ,14 ); -MD5STEP (F2 , b, c, d, a, in[0 ]+0xe9b6c7aa ,20 ); -MD5STEP (F2 , a, b, c, d, in[5 ]+0xd62f105d ,5 ); -MD5STEP (F2 , d, a, b, c, in[10 ]+0x02441453 ,9 ); -MD5STEP (F2 , c, d, a, b, in[15 ]+0xd8a1e681 ,14 ); -MD5STEP (F2 , b, c, d, a, in[4 ]+0xe7d3fbc8 ,20 ); -MD5STEP (F2 , a, b, c, d, in[9 ]+0x21e1cde6 ,5 ); -MD5STEP (F2 , d, a, b, c, in[14 ]+0xc33707d6 ,9 ); -MD5STEP (F2 , c, d, a, b, in[3 ]+0xf4d50d87 ,14 ); -MD5STEP (F2 , b, c, d, a, in[8 ]+0x455a14ed ,20 ); -MD5STEP (F2 , a, b, c, d, in[13 ]+0xa9e3e905 ,5 ); -MD5STEP (F2 , d, a, b, c, in[2 ]+0xfcefa3f8 ,9 ); -MD5STEP (F2 , c, d, a, b, in[7 ]+0x676f02d9 ,14 ); -MD5STEP (F2 , b, c, d, a, in[12 ]+0x8d2a4c8a ,20 ); - -MD5STEP (F3 , a, b, c, d, in[5 ]+0xfffa3942 ,4 ); -MD5STEP (F3 , d, a, b, c, in[8 ]+0x8771f681 ,11 ); -MD5STEP (F3 , c, d, a, b, in[11 ]+0x6d9d6122 ,16 ); -MD5STEP (F3 , b, c, d, a, in[14 ]+0xfde5380c ,23 ); -MD5STEP (F3 , a, b, c, d, in[1 ]+0xa4beea44 ,4 ); -MD5STEP (F3 , d, a, b, c, in[4 ]+0x4bdecfa9 ,11 ); -MD5STEP (F3 , c, d, a, b, in[7 ]+0xf6bb4b60 ,16 ); -MD5STEP (F3 , b, c, d, a, in[10 ]+0xbebfbc70 ,23 ); -MD5STEP (F3 , a, b, c, d, in[13 ]+0x289b7ec6 ,4 ); -MD5STEP (F3 , d, a, b, c, in[0 ]+0xeaa127fa ,11 ); -MD5STEP (F3 , c, d, a, b, in[3 ]+0xd4ef3085 ,16 ); -MD5STEP (F3 , b, c, d, a, in[6 ]+0x04881d05 ,23 ); -MD5STEP (F3 , a, b, c, d, in[9 ]+0xd9d4d039 ,4 ); -MD5STEP (F3 , d, a, b, c, in[12 ]+0xe6db99e5 ,11 ); -MD5STEP (F3 , c, d, a, b, in[15 ]+0x1fa27cf8 ,16 ); -MD5STEP (F3 , b, c, d, a, in[2 ]+0xc4ac5665 ,23 ); - -MD5STEP (F4 , a, b, c, d, in[0 ]+0xf4292244 ,6 ); -MD5STEP (F4 , d, a, b, c, in[7 ]+0x432aff97 ,10 ); -MD5STEP (F4 , c, d, a, b, in[14 ]+0xab9423a7 ,15 ); -MD5STEP (F4 , b, c, d, a, in[5 ]+0xfc93a039 ,21 ); -MD5STEP (F4 , a, b, c, d, in[12 ]+0x655b59c3 ,6 ); -MD5STEP (F4 , d, a, b, c, in[3 ]+0x8f0ccc92 ,10 ); -MD5STEP (F4 , c, d, a, b, in[10 ]+0xffeff47d ,15 ); -MD5STEP (F4 , b, c, d, a, in[1 ]+0x85845dd1 ,21 ); -MD5STEP (F4 , a, b, c, d, in[8 ]+0x6fa87e4f ,6 ); -MD5STEP (F4 , d, a, b, c, in[15 ]+0xfe2ce6e0 ,10 ); -MD5STEP (F4 , c, d, a, b, in[6 ]+0xa3014314 ,15 ); -MD5STEP (F4 , b, c, d, a, in[13 ]+0x4e0811a1 ,21 ); -MD5STEP (F4 , a, b, c, d, in[4 ]+0xf7537e82 ,6 ); -MD5STEP (F4 , d, a, b, c, in[11 ]+0xbd3af235 ,10 ); -MD5STEP (F4 , c, d, a, b, in[2 ]+0x2ad7d2bb ,15 ); -MD5STEP (F4 , b, c, d, a, in[9 ]+0xeb86d391 ,21 ); - - buf[0 ] += a; - buf[1 ] += b; - buf[2 ] += c; - buf[3 ] += d; -} - -#undef F1 -#undef F2 -#undef F3 -#undef F4 -#undef MD5STEP - -#endif /* !USE_SHA */ /********************************************************************* *
include/linux/random.h +0 -6
@@ -32,12 +32,6 @@/* Clear the entropy pool and associated counters. (Superuser only.) */ #define RNDCLEARPOOL _IO( 'R', 0x06 ) -struct rand_pool_info { -int entropy_count; -int buf_size; -__u32 buf[0 ]; -}; -/* Exported functions */ #ifdef __KERNEL__
Signature · 1 line
"Love the dolphins," she advised him. "Write by W.A.S.T.E.."