Crypto build cleanup: remove NEED_FIPS186_2_PRF

[libeap.git] / src / crypto / sha1-internal.c

diff --git a/src/crypto/sha1-internal.c b/src/crypto/sha1-internal.c
index 702b861..f40401c 100644 (file)
--- a/src/crypto/sha1-internal.c
+++ b/src/crypto/sha1-internal.c
@@ -32,7 +32,7 @@ static void SHA1Init(struct SHA1Context *context);
 static void SHA1Update(struct SHA1Context *context, const void *data, u32 len);
 static void SHA1Final(unsigned char digest[20], struct SHA1Context *context);
 #endif /* CONFIG_CRYPTO_INTERNAL */
-static void SHA1Transform(u32 state[5], const unsigned char buffer[64]);
+void SHA1Transform(u32 state[5], const unsigned char buffer[64]);
 
 
 /**
@@ -55,62 +55,6 @@ void sha1_vector(size_t num_elem, const u8 *addr[], const size_t *len,
 }
 
 
-#ifndef CONFIG_NO_FIPS186_2_PRF
-int fips186_2_prf(const u8 *seed, size_t seed_len, u8 *x, size_t xlen)
-{
-       u8 xkey[64];
-       u32 t[5], _t[5];
-       int i, j, m, k;
-       u8 *xpos = x;
-       u32 carry;
-
-       if (seed_len > sizeof(xkey))
-               seed_len = sizeof(xkey);
-
-       /* FIPS 186-2 + change notice 1 */
-
-       os_memcpy(xkey, seed, seed_len);
-       os_memset(xkey + seed_len, 0, 64 - seed_len);
-       t[0] = 0x67452301;
-       t[1] = 0xEFCDAB89;
-       t[2] = 0x98BADCFE;
-       t[3] = 0x10325476;
-       t[4] = 0xC3D2E1F0;
-
-       m = xlen / 40;
-       for (j = 0; j < m; j++) {
-               /* XSEED_j = 0 */
-               for (i = 0; i < 2; i++) {
-                       /* XVAL = (XKEY + XSEED_j) mod 2^b */
-
-                       /* w_i = G(t, XVAL) */
-                       os_memcpy(_t, t, 20);
-                       SHA1Transform(_t, xkey);
-                       _t[0] = host_to_be32(_t[0]);
-                       _t[1] = host_to_be32(_t[1]);
-                       _t[2] = host_to_be32(_t[2]);
-                       _t[3] = host_to_be32(_t[3]);
-                       _t[4] = host_to_be32(_t[4]);
-                       os_memcpy(xpos, _t, 20);
-
-                       /* XKEY = (1 + XKEY + w_i) mod 2^b */
-                       carry = 1;
-                       for (k = 19; k >= 0; k--) {
-                               carry += xkey[k] + xpos[k];
-                               xkey[k] = carry & 0xff;
-                               carry >>= 8;
-                       }
-
-                       xpos += SHA1_MAC_LEN;
-               }
-               /* x_j = w_0|w_1 */
-       }
-
-       return 0;
-}
-#endif /* CONFIG_NO_FIPS186_2_PRF */
-
-
 /* ===== start - public domain SHA1 implementation ===== */
 
 /*
@@ -239,7 +183,7 @@ void SHAPrintContext(SHA1_CTX *context, char *msg)
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
 
-static void SHA1Transform(u32 state[5], const unsigned char buffer[64])
+void SHA1Transform(u32 state[5], const unsigned char buffer[64])
 {
        u32 a, b, c, d, e;
        typedef union {