From 62944f7d2cb004030b96a5e114752692fb4ea756 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 16 Feb 2017 20:37:19 +0200 Subject: [PATCH] Add HMAC-SHA384 with internal crypto This is a copy of the internal HMAC-SHA256 implementation with the hash block size and output length updated to match SHA384 parameters. Signed-off-by: Jouni Malinen --- hostapd/Android.mk | 3 ++ hostapd/Makefile | 3 ++ src/crypto/sha384.c | 104 ++++++++++++++++++++++++++++++++++++++ wpa_supplicant/Android.mk | 3 ++ wpa_supplicant/Makefile | 3 ++ 5 files changed, 116 insertions(+) create mode 100644 src/crypto/sha384.c diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 2c5925b86..2118c8b0c 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -836,6 +836,9 @@ endif endif ifdef NEED_SHA384 L_CFLAGS += -DCONFIG_SHA384 +ifneq ($(CONFIG_TLS), openssl) +OBJS += src/crypto/sha384.c +endif OBJS += src/crypto/sha384-prf.c endif diff --git a/hostapd/Makefile b/hostapd/Makefile index 75d841ec7..d4dde89d7 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -875,6 +875,9 @@ endif endif ifdef NEED_SHA384 CFLAGS += -DCONFIG_SHA384 +ifneq ($(CONFIG_TLS), openssl) +OBJS += ../src/crypto/sha384.o +endif OBJS += ../src/crypto/sha384-prf.o endif diff --git a/src/crypto/sha384.c b/src/crypto/sha384.c new file mode 100644 index 000000000..ee136ce99 --- /dev/null +++ b/src/crypto/sha384.c @@ -0,0 +1,104 @@ +/* + * SHA-384 hash implementation and interface functions + * Copyright (c) 2003-2017, Jouni Malinen + * + * This software may be distributed under the terms of the BSD license. + * See README for more details. + */ + +#include "includes.h" + +#include "common.h" +#include "sha384.h" +#include "crypto.h" + + +/** + * hmac_sha384_vector - HMAC-SHA384 over data vector (RFC 2104) + * @key: Key for HMAC operations + * @key_len: Length of the key in bytes + * @num_elem: Number of elements in the data vector + * @addr: Pointers to the data areas + * @len: Lengths of the data blocks + * @mac: Buffer for the hash (48 bytes) + * Returns: 0 on success, -1 on failure + */ +int hmac_sha384_vector(const u8 *key, size_t key_len, size_t num_elem, + const u8 *addr[], const size_t *len, u8 *mac) +{ + unsigned char k_pad[128]; /* padding - key XORd with ipad/opad */ + unsigned char tk[48]; + const u8 *_addr[6]; + size_t _len[6], i; + + if (num_elem > 5) { + /* + * Fixed limit on the number of fragments to avoid having to + * allocate memory (which could fail). + */ + return -1; + } + + /* if key is longer than 128 bytes reset it to key = SHA384(key) */ + if (key_len > 128) { + if (sha384_vector(1, &key, &key_len, tk) < 0) + return -1; + key = tk; + key_len = 48; + } + + /* the HMAC_SHA384 transform looks like: + * + * SHA384(K XOR opad, SHA384(K XOR ipad, text)) + * + * where K is an n byte key + * ipad is the byte 0x36 repeated 128 times + * opad is the byte 0x5c repeated 128 times + * and text is the data being protected */ + + /* start out by storing key in ipad */ + os_memset(k_pad, 0, sizeof(k_pad)); + os_memcpy(k_pad, key, key_len); + /* XOR key with ipad values */ + for (i = 0; i < 128; i++) + k_pad[i] ^= 0x36; + + /* perform inner SHA384 */ + _addr[0] = k_pad; + _len[0] = 128; + for (i = 0; i < num_elem; i++) { + _addr[i + 1] = addr[i]; + _len[i + 1] = len[i]; + } + if (sha384_vector(1 + num_elem, _addr, _len, mac) < 0) + return -1; + + os_memset(k_pad, 0, sizeof(k_pad)); + os_memcpy(k_pad, key, key_len); + /* XOR key with opad values */ + for (i = 0; i < 128; i++) + k_pad[i] ^= 0x5c; + + /* perform outer SHA384 */ + _addr[0] = k_pad; + _len[0] = 128; + _addr[1] = mac; + _len[1] = SHA384_MAC_LEN; + return sha384_vector(2, _addr, _len, mac); +} + + +/** + * hmac_sha384 - HMAC-SHA384 over data buffer (RFC 2104) + * @key: Key for HMAC operations + * @key_len: Length of the key in bytes + * @data: Pointers to the data area + * @data_len: Length of the data area + * @mac: Buffer for the hash (48 bytes) + * Returns: 0 on success, -1 on failure + */ +int hmac_sha384(const u8 *key, size_t key_len, const u8 *data, + size_t data_len, u8 *mac) +{ + return hmac_sha384_vector(key, key_len, 1, &data, &data_len, mac); +} diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 9ff9b9989..f150ef2bf 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -1285,6 +1285,9 @@ OBJS += $(SHA256OBJS) endif ifdef NEED_SHA384 L_CFLAGS += -DCONFIG_SHA384 +ifneq ($(CONFIG_TLS), openssl) +OBJS += src/crypto/sha384.c +endif OBJS += src/crypto/sha384-prf.c endif diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 4455dca1a..91ea4d294 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -1330,6 +1330,9 @@ endif OBJS += $(SHA256OBJS) endif ifdef NEED_SHA384 +ifneq ($(CONFIG_TLS), openssl) +OBJS += ../src/crypto/sha384.o +endif CFLAGS += -DCONFIG_SHA384 OBJS += ../src/crypto/sha384-prf.o endif