aboutsummaryrefslogtreecommitdiffstats
path: root/src/crypto/sha1-tlsprf.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2012-08-19 13:53:15 (GMT)
committerJouni Malinen <j@w1.fi>2012-08-19 13:53:15 (GMT)
commit44ec48ebfd19c1828c26880d7f32f6e658477e30 (patch)
treeb54df008fc9308d07876126c090fd57825b73417 /src/crypto/sha1-tlsprf.c
parentbe9e8c293caee7d08257da1807fd9c20f4af61c3 (diff)
downloadhostap-44ec48ebfd19c1828c26880d7f32f6e658477e30.zip
hostap-44ec48ebfd19c1828c26880d7f32f6e658477e30.tar.gz
hostap-44ec48ebfd19c1828c26880d7f32f6e658477e30.tar.bz2
FIPS: Remove md5-non-fips.c
Commit c9e08af24fd7dda3f21674cdc744579b8c38fa28 removed the only user of the special case MD5 use that would be allowed in FIPS mode in tls_prf_sha1_md5(). Commit 271dbf1594bea461ea2ea7946a773a30bfa254aa removed the file from the build, but left the implementation into the repository. To clean things up even further, remove this functionality completely since it is not expected to be needed for FIPS mode anymore. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src/crypto/sha1-tlsprf.c')
-rw-r--r--src/crypto/sha1-tlsprf.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/crypto/sha1-tlsprf.c b/src/crypto/sha1-tlsprf.c
index e79265b..0effd9b 100644
--- a/src/crypto/sha1-tlsprf.c
+++ b/src/crypto/sha1-tlsprf.c
@@ -71,19 +71,16 @@ int tls_prf_sha1_md5(const u8 *secret, size_t secret_len, const char *label,
S2--;
}
- hmac_md5_vector_non_fips_allow(S1, L_S1, 2, &MD5_addr[1], &MD5_len[1],
- A_MD5);
+ hmac_md5_vector(S1, L_S1, 2, &MD5_addr[1], &MD5_len[1], A_MD5);
hmac_sha1_vector(S2, L_S2, 2, &SHA1_addr[1], &SHA1_len[1], A_SHA1);
MD5_pos = MD5_MAC_LEN;
SHA1_pos = SHA1_MAC_LEN;
for (i = 0; i < outlen; i++) {
if (MD5_pos == MD5_MAC_LEN) {
- hmac_md5_vector_non_fips_allow(S1, L_S1, 3, MD5_addr,
- MD5_len, P_MD5);
+ hmac_md5_vector(S1, L_S1, 3, MD5_addr, MD5_len, P_MD5);
MD5_pos = 0;
- hmac_md5_non_fips_allow(S1, L_S1, A_MD5, MD5_MAC_LEN,
- A_MD5);
+ hmac_md5(S1, L_S1, A_MD5, MD5_MAC_LEN, A_MD5);
}
if (SHA1_pos == SHA1_MAC_LEN) {
hmac_sha1_vector(S2, L_S2, 3, SHA1_addr, SHA1_len,