Merged the hostap_2.6 updates, and the Leap of Faith work, from the hostap_update...

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

diff --git a/libeap/src/crypto/sha1-internal.c b/libeap/src/crypto/sha1-internal.c
index 3f05ca1..ffcba66 100644 (file)
--- a/libeap/src/crypto/sha1-internal.c
+++ b/libeap/src/crypto/sha1-internal.c
@@ -2,14 +2,8 @@
  * SHA1 hash implementation and interface functions
  * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "includes.h"
@@ -25,6 +19,7 @@ typedef struct SHA1Context SHA1_CTX;
 void SHA1Transform(u32 state[5], const unsigned char buffer[64]);
 
 
+#ifdef CONFIG_CRYPTO_INTERNAL
 /**
  * sha1_vector - SHA-1 hash for data vector
  * @num_elem: Number of elements in the data vector
@@ -38,12 +33,16 @@ int sha1_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
        SHA1_CTX ctx;
        size_t i;
 
+       if (TEST_FAIL())
+               return -1;
+
        SHA1Init(&ctx);
        for (i = 0; i < num_elem; i++)
                SHA1Update(&ctx, addr[i], len[i]);
        SHA1Final(mac, &ctx);
        return 0;
 }
+#endif /* CONFIG_CRYPTO_INTERNAL */
 
 
 /* ===== start - public domain SHA1 implementation ===== */
@@ -298,7 +297,6 @@ void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
                         255);
        }
        /* Wipe variables */
-       i = 0;
        os_memset(context->buffer, 0, 64);
        os_memset(context->state, 0, 20);
        os_memset(context->count, 0, 8);