jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move SHA1-based PRF function into a separate C file

Browse source 
This makes it easier to conditionally build in SHA1 functions based
on which TLS/crypto library is used.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-08-16 20:23:12 +03:00
parent e40c86ad27
commit d6150094e0
11 changed files with 87 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hostapd/Android.mk
View file

@ -670,6 +670,7 @@ endif
SHA1OBJS =
ifdef NEED_SHA1
SHA1OBJS += src/crypto/sha1.c
SHA1OBJS += src/crypto/sha1-prf.c
ifdef CONFIG_INTERNAL_SHA1
SHA1OBJS += src/crypto/sha1-internal.c
ifdef NEED_FIPS186_2_PRF

1
hostapd/Makefile
View file

@ -661,6 +661,7 @@ endif
ifdef NEED_SHA1
SHA1OBJS += ../src/crypto/sha1.o
SHA1OBJS += ../src/crypto/sha1-prf.o
ifdef CONFIG_INTERNAL_SHA1
SHA1OBJS += ../src/crypto/sha1-internal.o
ifdef NEED_FIPS186_2_PRF

1
src/crypto/Makefile
View file

@ -38,6 +38,7 @@ LIB_OBJS= \
sha1.o \
sha1-internal.o \
sha1-pbkdf2.o \
sha1-prf.o \
sha1-tlsprf.o \
sha1-tprf.o \
sha256.o \

66
src/crypto/sha1-prf.c Normal file
View file

@ -0,0 +1,66 @@
/*
* SHA1-based PRF
* Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#include "includes.h"
#include "common.h"
#include "sha1.h"
#include "crypto.h"
/**
* sha1_prf - SHA1-based Pseudo-Random Function (PRF) (IEEE 802.11i, 8.5.1.1)
* @key: Key for PRF
* @key_len: Length of the key in bytes
* @label: A unique label for each purpose of the PRF
* @data: Extra data to bind into the key
* @data_len: Length of the data
* @buf: Buffer for the generated pseudo-random key
* @buf_len: Number of bytes of key to generate
* Returns: 0 on success, -1 of failure
*
* This function is used to derive new, cryptographically separate keys from a
* given key (e.g., PMK in IEEE 802.11i).
*/
int sha1_prf(const u8 *key, size_t key_len, const char *label,
const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
{
u8 counter = 0;
size_t pos, plen;
u8 hash[SHA1_MAC_LEN];
size_t label_len = os_strlen(label) + 1;
const unsigned char *addr[3];
size_t len[3];
addr[0] = (u8 *) label;
len[0] = label_len;
addr[1] = data;
len[1] = data_len;
addr[2] = &counter;
len[2] = 1;
pos = 0;
while (pos < buf_len) {
plen = buf_len - pos;
if (plen >= SHA1_MAC_LEN) {
if (hmac_sha1_vector(key, key_len, 3, addr, len,
&buf[pos]))
return -1;
pos += SHA1_MAC_LEN;
} else {
if (hmac_sha1_vector(key, key_len, 3, addr, len,
hash))
return -1;
os_memcpy(&buf[pos], hash, plen);
break;
}
counter++;
}
return 0;
}

53
src/crypto/sha1.c
View file

@ -102,56 +102,3 @@ int hmac_sha1(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
{
return hmac_sha1_vector(key, key_len, 1, &data, &data_len, mac);
}
/**
* sha1_prf - SHA1-based Pseudo-Random Function (PRF) (IEEE 802.11i, 8.5.1.1)
* @key: Key for PRF
* @key_len: Length of the key in bytes
* @label: A unique label for each purpose of the PRF
* @data: Extra data to bind into the key
* @data_len: Length of the data
* @buf: Buffer for the generated pseudo-random key
* @buf_len: Number of bytes of key to generate
* Returns: 0 on success, -1 of failure
*
* This function is used to derive new, cryptographically separate keys from a
* given key (e.g., PMK in IEEE 802.11i).
*/
int sha1_prf(const u8 *key, size_t key_len, const char *label,
const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
{
u8 counter = 0;
size_t pos, plen;
u8 hash[SHA1_MAC_LEN];
size_t label_len = os_strlen(label) + 1;
const unsigned char *addr[3];
size_t len[3];
addr[0] = (u8 *) label;
len[0] = label_len;
addr[1] = data;
len[1] = data_len;
addr[2] = &counter;
len[2] = 1;
pos = 0;
while (pos < buf_len) {
plen = buf_len - pos;
if (plen >= SHA1_MAC_LEN) {
if (hmac_sha1_vector(key, key_len, 3, addr, len,
&buf[pos]))
return -1;
pos += SHA1_MAC_LEN;
} else {
if (hmac_sha1_vector(key, key_len, 3, addr, len,
hash))
return -1;
os_memcpy(&buf[pos], hash, plen);
break;
}
counter++;
}
return 0;
}

1
wpa_supplicant/Android.mk
View file

@ -1055,6 +1055,7 @@ endif
SHA1OBJS =
ifdef NEED_SHA1
SHA1OBJS += src/crypto/sha1.c
SHA1OBJS += src/crypto/sha1-prf.c
ifdef CONFIG_INTERNAL_SHA1
SHA1OBJS += src/crypto/sha1-internal.c
ifdef NEED_FIPS186_2_PRF

1
wpa_supplicant/Makefile
View file

@ -1082,6 +1082,7 @@ endif
ifdef NEED_SHA1
SHA1OBJS += ../src/crypto/sha1.o
SHA1OBJS += ../src/crypto/sha1-prf.o
ifdef CONFIG_INTERNAL_SHA1
SHA1OBJS += ../src/crypto/sha1-internal.o
ifdef NEED_FIPS186_2_PRF

4
wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
View file

@ -410,6 +410,10 @@
RelativePath="..\..\..\src\crypto\sha1-pbkdf2.c"
>
</File>
<File
RelativePath="..\..\..\src\crypto\sha1-prf.c"
>
</File>
<File
RelativePath="..\..\..\src\crypto\sha1-tlsprf.c"
>

4
wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
View file

@ -205,6 +205,10 @@
RelativePath="..\..\..\src\crypto\sha1-internal.c"
>
</File>
<File
RelativePath="..\..\..\src\crypto\sha1-prf.c"
>
</File>
<File
RelativePath="..\..\..\src\crypto\sha1-pbkdf2.c"
>

4
wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
View file

@ -398,6 +398,10 @@
RelativePath="..\..\..\src\crypto\sha1-pbkdf2.c"
>
</File>
<File
RelativePath="..\..\..\src\crypto\sha1-prf.c"
>
</File>
<File
RelativePath="..\..\..\src\crypto\sha1-tlsprf.c"
>

4
wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
View file

@ -398,6 +398,10 @@
RelativePath="..\..\..\src\crypto\sha1-pbkdf2.c"
>
</File>
<File
RelativePath="..\..\..\src\crypto\sha1-prf.c"
>
</File>
<File
RelativePath="..\..\..\src\crypto\sha1-tlsprf.c"
>