From 4a99031b8d9ee9254b5df7265d2f82dc72856e89 Mon Sep 17 00:00:00 2001 From: toddouska Date: Thu, 10 Apr 2014 14:58:15 -0700 Subject: [PATCH] fix psk requires with different first byte --- src/internal.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/internal.c b/src/internal.c index 5147baeb7..622a6b8f2 100644 --- a/src/internal.c +++ b/src/internal.c @@ -9749,6 +9749,14 @@ static void PickHashSigAlgo(CYASSL* ssl, return 1; break; + case TLS_PSK_WITH_AES_128_CCM: + case TLS_PSK_WITH_AES_256_CCM: + case TLS_PSK_WITH_AES_128_CCM_8: + case TLS_PSK_WITH_AES_256_CCM_8: + if (requirement == REQUIRES_PSK) + return 1; + break; + default: CYASSL_MSG("Unsupported cipher suite, CipherRequires ECC"); return 0; @@ -9821,25 +9829,9 @@ static void PickHashSigAlgo(CYASSL* ssl, #endif case TLS_PSK_WITH_AES_128_CBC_SHA256 : - if (requirement == REQUIRES_PSK) - return 1; - break; - case TLS_PSK_WITH_AES_128_CBC_SHA : - if (requirement == REQUIRES_PSK) - return 1; - break; - case TLS_PSK_WITH_AES_256_CBC_SHA : - if (requirement == REQUIRES_PSK) - return 1; - break; - case TLS_PSK_WITH_NULL_SHA256 : - if (requirement == REQUIRES_PSK) - return 1; - break; - case TLS_PSK_WITH_NULL_SHA : if (requirement == REQUIRES_PSK) return 1;