[PATCH] crypto/wolfssl: fix build

Daniel Golle daniel at makrotopia.org
Sat Apr 28 12:06:32 PDT 2018


Replace non-existing config-symbol and fix variable-name typo which
caused the build to fail with CONFIG_TLS=wolfssl.

Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 src/crypto/crypto_wolfssl.c | 4 ++--
 src/crypto/tls_wolfssl.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/crypto/crypto_wolfssl.c b/src/crypto/crypto_wolfssl.c
index 90163c4f2..758bdbe1b 100644
--- a/src/crypto/crypto_wolfssl.c
+++ b/src/crypto/crypto_wolfssl.c
@@ -291,7 +291,7 @@ int pbkdf2_sha1(const char *passphrase, const u8 *ssid, size_t ssid_len,
 }
 
 
-#ifdef CONFIG_DES
+#ifndef CONFIG_INTERNAL_DES
 int des_encrypt(const u8 *clear, const u8 *key, u8 *cypher)
 {
 	Des des;
@@ -312,7 +312,7 @@ int des_encrypt(const u8 *clear, const u8 *key, u8 *cypher)
 
 	return 0;
 }
-#endif /* CONFIG_DES */
+#endif /* !CONFIG_INTERNAL_DES */
 
 
 void * aes_encrypt_init(const u8 *key, size_t len)
diff --git a/src/crypto/tls_wolfssl.c b/src/crypto/tls_wolfssl.c
index b7c452ec5..beda728a6 100644
--- a/src/crypto/tls_wolfssl.c
+++ b/src/crypto/tls_wolfssl.c
@@ -2037,14 +2037,14 @@ static int tls_sess_sec_cb(WOLFSSL *s, void *secret, int *secret_len, void *arg)
 				      sizeof(client_random)) == 0 ||
 	    wolfSSL_get_server_random(s, server_random,
 				      sizeof(server_random)) == 0 ||
-	    wolfSSL_get_SessionTicket(s, conn->session_ticket, &ticketLen) != 1)
+	    wolfSSL_get_SessionTicket(s, conn->session_ticket, &ticket_len) != 1)
 		return 1;
 
 	if (ticket_len == 0)
 		return 0;
 
 	ret = conn->session_ticket_cb(conn->session_ticket_cb_ctx,
-				      conn->session_ticket, ticketLen,
+				      conn->session_ticket, ticket_len,
 				      client_random, server_random, secret);
 	if (ret <= 0)
 		return 1;
-- 
2.17.0




More information about the Hostap mailing list