feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #574 from JacobBarthelmeh/Testing

Browse Source 
Static Analysis : fix a warning of unused variable
This commit is contained in:
John Safranek
2016-09-22 14:09:46 -07:00
committed by GitHub
parent 18944dacbf c43fd150e9
commit e4b8e6a447
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tls.c
View File

@ -2895,7 +2895,6 @@ int TLSX_ValidateEllipticCurves(WOLFSSL* ssl, byte first, byte second) {
if (first == ECC_BYTE) { if (first == ECC_BYTE) {
switch (second) { switch (second) {
#ifndef NO_DSA
/* ECDHE_ECDSA */ /* ECDHE_ECDSA */
case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA: case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA: case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
@ -2911,6 +2910,7 @@ int TLSX_ValidateEllipticCurves(WOLFSSL* ssl, byte first, byte second) {
key |= ssl->eccTempKeySz == octets; key |= ssl->eccTempKeySz == octets;
break; break;
#ifdef WOLFSSL_STATIC_DH
/* ECDH_ECDSA */ /* ECDH_ECDSA */
case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA: case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA: case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
@ -2923,7 +2923,7 @@ int TLSX_ValidateEllipticCurves(WOLFSSL* ssl, byte first, byte second) {
sig |= ssl->pkCurveOID == oid; sig |= ssl->pkCurveOID == oid;
key |= ssl->pkCurveOID == oid; key |= ssl->pkCurveOID == oid;
break; break;
#endif #endif /* WOLFSSL_STATIC_DH */
#ifndef NO_RSA #ifndef NO_RSA
/* ECDHE_RSA */ /* ECDHE_RSA */
case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA: case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
@ -2938,6 +2938,7 @@ int TLSX_ValidateEllipticCurves(WOLFSSL* ssl, byte first, byte second) {
key |= ssl->eccTempKeySz == octets; key |= ssl->eccTempKeySz == octets;
break; break;
#ifdef WOLFSSL_STATIC_DH
/* ECDH_RSA */ /* ECDH_RSA */
case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA: case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA: case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
@ -2950,6 +2951,7 @@ int TLSX_ValidateEllipticCurves(WOLFSSL* ssl, byte first, byte second) {
sig = 1; sig = 1;
key |= ssl->pkCurveOID == oid; key |= ssl->pkCurveOID == oid;
break; break;
#endif /* WOLFSSL_STATIC_DH */
#endif #endif
default: default:
sig = 1; sig = 1;
@ -2961,14 +2963,12 @@ int TLSX_ValidateEllipticCurves(WOLFSSL* ssl, byte first, byte second) {
/* ChaCha20-Poly1305 ECC cipher suites */ /* ChaCha20-Poly1305 ECC cipher suites */
if (first == CHACHA_BYTE) { if (first == CHACHA_BYTE) {
switch (second) { switch (second) {
#ifndef NO_DSA
/* ECDHE_ECDSA */ /* ECDHE_ECDSA */
case TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 : case TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 :
case TLS_ECDHE_ECDSA_WITH_CHACHA20_OLD_POLY1305_SHA256 : case TLS_ECDHE_ECDSA_WITH_CHACHA20_OLD_POLY1305_SHA256 :
sig |= ssl->pkCurveOID == oid; sig |= ssl->pkCurveOID == oid;
key |= ssl->eccTempKeySz == octets; key |= ssl->eccTempKeySz == octets;
break; break;
#endif
#ifndef NO_RSA #ifndef NO_RSA
/* ECDHE_RSA */ /* ECDHE_RSA */
case TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 : case TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 :