wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 12:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve unused "typeH" warning.

Browse Source
This commit is contained in:
David Garske
2016-03-17 15:56:51 -07:00
parent e1787fe160
commit 0e43fca1f3
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/internal.c
View File

@@ -15065,7 +15065,6 @@ int DoSessionTicket(WOLFSSL* ssl,
#if !defined(NO_DH) && !defined(NO_RSA) #if !defined(NO_DH) && !defined(NO_RSA)
case diffie_hellman_kea: case diffie_hellman_kea:
{ {
int typeH = 0;
enum wc_HashType hashType = WC_HASH_TYPE_NONE; enum wc_HashType hashType = WC_HASH_TYPE_NONE;
idx = RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ; idx = RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ;
@@ -15173,28 +15172,24 @@ int DoSessionTicket(WOLFSSL* ssl,
case sha512_mac: case sha512_mac:
#ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA512
hashType = WC_HASH_TYPE_SHA512; hashType = WC_HASH_TYPE_SHA512;
typeH = SHA512h;
#endif #endif
break; break;
case sha384_mac: case sha384_mac:
#ifdef WOLFSSL_SHA384 #ifdef WOLFSSL_SHA384
hashType = WC_HASH_TYPE_SHA384; hashType = WC_HASH_TYPE_SHA384;
typeH = SHA384h;
#endif #endif
break; break;
case sha256_mac: case sha256_mac:
#ifndef NO_SHA256 #ifndef NO_SHA256
hashType = WC_HASH_TYPE_SHA256; hashType = WC_HASH_TYPE_SHA256;
typeH = SHA256h;
#endif #endif
break; break;
case sha_mac: case sha_mac:
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
hashType = WC_HASH_TYPE_SHA; hashType = WC_HASH_TYPE_SHA;
typeH = SHAh;
#endif #endif
break; break;
@@ -15256,12 +15251,38 @@ int DoSessionTicket(WOLFSSL* ssl,
{ {
/* For TLS 1.2 re-encode signature */ /* For TLS 1.2 re-encode signature */
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {
int typeH = 0;
byte* encodedSig = (byte*)XMALLOC(MAX_ENCODED_SIG_SZ, NULL, byte* encodedSig = (byte*)XMALLOC(MAX_ENCODED_SIG_SZ, NULL,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
if (encodedSig == NULL) { if (encodedSig == NULL) {
ERROR_OUT(MEMORY_E, exit_sske); ERROR_OUT(MEMORY_E, exit_sske);
} }
switch (ssl->suites->hashAlgo) {
case sha512_mac:
#ifdef WOLFSSL_SHA512
typeH = SHA512h;
#endif
break;
case sha384_mac:
#ifdef WOLFSSL_SHA384
typeH = SHA384h;
#endif
break;
case sha256_mac:
#ifndef NO_SHA256
typeH = SHA256h;
#endif
break;
case sha_mac:
#ifndef NO_OLD_TLS
typeH = SHAh;
#endif
break;
default:
break;
}
ssl->buffers.sig.length = wc_EncodeSignature(encodedSig, ssl->buffers.sig.length = wc_EncodeSignature(encodedSig,
ssl->buffers.sig.buffer, ssl->buffers.sig.length, typeH); ssl->buffers.sig.buffer, ssl->buffers.sig.length, typeH);