DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Return success/failure result from sha384_prf()

Browse source 
This makes the function more consistent with sha256_prf().

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2017-03-12 19:40:29 +02:00
parent 0a6147991e
commit ef23838590
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/crypto/sha384-prf.c
View file

@ -1,6 +1,6 @@
/* /*
* SHA384-based KDF (IEEE 802.11ac) * SHA384-based KDF (IEEE 802.11ac)
* Copyright (c) 2003-2015, Jouni Malinen <j@w1.fi> * Copyright (c) 2003-2017, Jouni Malinen <j@w1.fi>
* *
* This software may be distributed under the terms of the BSD license. * This software may be distributed under the terms of the BSD license.
* See README for more details. * See README for more details.
@ -22,14 +22,16 @@
* @data_len: Length of the data * @data_len: Length of the data
* @buf: Buffer for the generated pseudo-random key * @buf: Buffer for the generated pseudo-random key
* @buf_len: Number of bytes of key to generate * @buf_len: Number of bytes of key to generate
* Returns: 0 on success, -1 on failure
* *
* This function is used to derive new, cryptographically separate keys from a * This function is used to derive new, cryptographically separate keys from a
* given key. * given key.
*/ */
void sha384_prf(const u8 *key, size_t key_len, const char *label, int sha384_prf(const u8 *key, size_t key_len, const char *label,
const u8 *data, size_t data_len, u8 *buf, size_t buf_len) const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
{ {
sha384_prf_bits(key, key_len, label, data, data_len, buf, buf_len * 8); return sha384_prf_bits(key, key_len, label, data, data_len, buf,
buf_len * 8);
} }
@ -42,15 +44,16 @@ void sha384_prf(const u8 *key, size_t key_len, const char *label,
* @data_len: Length of the data * @data_len: Length of the data
* @buf: Buffer for the generated pseudo-random key * @buf: Buffer for the generated pseudo-random key
* @buf_len: Number of bits of key to generate * @buf_len: Number of bits of key to generate
* Returns: 0 on success, -1 on failure
* *
* This function is used to derive new, cryptographically separate keys from a * This function is used to derive new, cryptographically separate keys from a
* given key. If the requested buf_len is not divisible by eight, the least * given key. If the requested buf_len is not divisible by eight, the least
* significant 1-7 bits of the last octet in the output are not part of the * significant 1-7 bits of the last octet in the output are not part of the
* requested output. * requested output.
*/ */
void sha384_prf_bits(const u8 *key, size_t key_len, const char *label, int sha384_prf_bits(const u8 *key, size_t key_len, const char *label,
const u8 *data, size_t data_len, u8 *buf, const u8 *data, size_t data_len, u8 *buf,
size_t buf_len_bits) size_t buf_len_bits)
{ {
u16 counter = 1; u16 counter = 1;
size_t pos, plen; size_t pos, plen;
@ -75,11 +78,14 @@ void sha384_prf_bits(const u8 *key, size_t key_len, const char *label,
plen = buf_len - pos; plen = buf_len - pos;
WPA_PUT_LE16(counter_le, counter); WPA_PUT_LE16(counter_le, counter);
if (plen >= SHA384_MAC_LEN) { if (plen >= SHA384_MAC_LEN) {
hmac_sha384_vector(key, key_len, 4, addr, len, if (hmac_sha384_vector(key, key_len, 4, addr, len,
&buf[pos]); &buf[pos]) < 0)
return -1;
pos += SHA384_MAC_LEN; pos += SHA384_MAC_LEN;
} else { } else {
hmac_sha384_vector(key, key_len, 4, addr, len, hash); if (hmac_sha384_vector(key, key_len, 4, addr, len,
hash) < 0)
return -1;
os_memcpy(&buf[pos], hash, plen); os_memcpy(&buf[pos], hash, plen);
pos += plen; pos += plen;
break; break;
@ -97,4 +103,6 @@ void sha384_prf_bits(const u8 *key, size_t key_len, const char *label,
} }
os_memset(hash, 0, sizeof(hash)); os_memset(hash, 0, sizeof(hash));
return 0;
} }

12
src/crypto/sha384.h
View file

@ -1,6 +1,6 @@
/* /*
* SHA384 hash implementation and interface functions * SHA384 hash implementation and interface functions
* Copyright (c) 2015, Jouni Malinen <j@w1.fi> * Copyright (c) 2015-2017, Jouni Malinen <j@w1.fi>
* *
* This software may be distributed under the terms of the BSD license. * This software may be distributed under the terms of the BSD license.
* See README for more details. * See README for more details.
@ -15,10 +15,10 @@ int hmac_sha384_vector(const u8 *key, size_t key_len, size_t num_elem,
const u8 *addr[], const size_t *len, u8 *mac); const u8 *addr[], const size_t *len, u8 *mac);
int hmac_sha384(const u8 *key, size_t key_len, const u8 *data, int hmac_sha384(const u8 *key, size_t key_len, const u8 *data,
size_t data_len, u8 *mac); size_t data_len, u8 *mac);
void sha384_prf(const u8 *key, size_t key_len, const char *label, int sha384_prf(const u8 *key, size_t key_len, const char *label,
const u8 *data, size_t data_len, u8 *buf, size_t buf_len); const u8 *data, size_t data_len, u8 *buf, size_t buf_len);
void sha384_prf_bits(const u8 *key, size_t key_len, const char *label, int sha384_prf_bits(const u8 *key, size_t key_len, const char *label,
const u8 *data, size_t data_len, u8 *buf, const u8 *data, size_t data_len, u8 *buf,
size_t buf_len_bits); size_t buf_len_bits);
#endif /* SHA384_H */ #endif /* SHA384_H */