From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 10 Dec 2018 17:49:29 +0000 (+0100)
Subject: tls: fix a potential (currently "disabled" by a macro) SHA1-related bug
X-Git-Tag: 1_30_0~228
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c67ff8a1b04c56b9445a891cb48db7fc0f0f4445;p=oweals%2Fbusybox.git

tls: fix a potential (currently "disabled" by a macro) SHA1-related bug

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/tls.c b/networking/tls.c
index be13c6d5e..253d687b4 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -525,7 +525,7 @@ static unsigned hmac(tls_state_t *tls, uint8_t *out, uint8_t *key, unsigned key_
 	va_start(va, key_size);
 
 	hmac_begin(&pre, key, key_size,
-			(ENABLE_FEATURE_TLS_SHA1 || tls->MAC_size == SHA256_OUTSIZE)
+			(!ENABLE_FEATURE_TLS_SHA1 || tls->MAC_size == SHA256_OUTSIZE)
 				? sha256_begin
 				: sha1_begin
 	);