wolfSSL: Fix EAP-FAST key derivation

Implement tls_connection_get_eap_fast_key() using cryptographic
primitives as wolfSSL implements different spec.

Signed-off-by: Sean Parkinson <sean@wolfssl.com>

diff --git a/src/crypto/tls_wolfssl.c b/src/crypto/tls_wolfssl.c
index c72fa72d6d90085921c7860bcb42c828f81a57aa..9544e2f7e24366b4fb8343895f351c29dcbe403c 100644 (file)
--- a/src/crypto/tls_wolfssl.c
+++ b/src/crypto/tls_wolfssl.c
@@ -10,6 +10,8 @@
 
 #include "common.h"
 #include "crypto.h"
+#include "crypto/sha1.h"
+#include "crypto/sha256.h"
 #include "tls.h"
 
 /* wolfSSL includes */
@@ -1962,18 +1964,58 @@ int tls_connection_export_key(void *tls_ctx, struct tls_connection *conn,
 }
 
 
+#define SEED_LEN       (RAN_LEN + RAN_LEN)
+
 int tls_connection_get_eap_fast_key(void *tls_ctx, struct tls_connection *conn,
                                    u8 *out, size_t out_len)
 {
-       int ret;
+       byte seed[SEED_LEN];
+       int ret = -1;
+       WOLFSSL *ssl;
+       byte *tmp_out;
+       byte *_out;
+       int skip = 0;
+       byte *master_key;
+       unsigned int master_key_len;
+       byte *server_random;
+       unsigned int server_len;
+       byte *client_random;
+       unsigned int client_len;
 
        if (!conn || !conn->ssl)
                return -1;
+       ssl = conn->ssl;
+
+       skip = 2 * (wolfSSL_GetKeySize(ssl) + wolfSSL_GetHmacSize(ssl) +
+                   wolfSSL_GetIVSize(ssl));
 
-       ret = wolfSSL_make_eap_keys(conn->ssl, out, out_len, "key expansion");
-       if (ret != 0)
+       tmp_out = os_malloc(skip + out_len);
+       if (!tmp_out)
                return -1;
-       return 0;
+       _out = tmp_out;
+
+       wolfSSL_get_keys(ssl, &master_key, &master_key_len, &server_random,
+                        &server_len, &client_random, &client_len);
+       os_memcpy(seed, server_random, RAN_LEN);
+       os_memcpy(seed + RAN_LEN, client_random, RAN_LEN);
+
+       if (wolfSSL_GetVersion(ssl) == WOLFSSL_TLSV1_2) {
+               tls_prf_sha256(master_key, master_key_len,
+                              "key expansion", seed, sizeof(seed),
+                              _out, skip + out_len);
+               ret = 0;
+       } else {
+               ret = tls_prf_sha1_md5(master_key, master_key_len,
+                                      "key expansion", seed, sizeof(seed),
+                                      _out, skip + out_len);
+       }
+
+       os_memset(master_key, 0, master_key_len);
+       if (ret == 0)
+               os_memcpy(out, _out + skip, out_len);
+       bin_clear_free(tmp_out, skip + out_len);
+
+       return ret;
 }
 
 

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 09956bda308de0d7abfb3043bd1e038d2fbf409e..c2e93e20b58ac55a4248406c084606e6b387984a 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1059,6 +1059,7 @@ OBJS_p += ../src/crypto/crypto_wolfssl.o
 ifdef NEED_FIPS186_2_PRF
 OBJS += ../src/crypto/fips_prf_wolfssl.o
 endif
+NEED_TLS_PRF_SHA256=y
 LIBS += -lwolfssl -lm
 LIBS_p += -lwolfssl -lm
 endif