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

fix local variable masking global in SetKeysSide()

Browse Source
This commit is contained in:
John Safranek
2015-01-06 09:27:40 -08:00
parent 46d9037d26
commit 06714584f9
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/keys.c
View File

@@ -2325,8 +2325,8 @@ static int SetAuthKeys(OneTimeAuth* authentication, Keys* keys,
int SetKeysSide(CYASSL* ssl, enum encrypt_side side) int SetKeysSide(CYASSL* ssl, enum encrypt_side side)
{ {
int devId = NO_CAVIUM_DEVICE, ret, copy = 0; int devId = NO_CAVIUM_DEVICE, ret, copy = 0;
Ciphers* encrypt = NULL; Ciphers* enc = NULL;
Ciphers* decrypt = NULL; Ciphers* dec = NULL;
Keys* keys = &ssl->keys; Keys* keys = &ssl->keys;
(void)copy; (void)copy;
@@ -2344,16 +2344,16 @@ int SetKeysSide(CYASSL* ssl, enum encrypt_side side)
switch (side) { switch (side) {
case ENCRYPT_SIDE_ONLY: case ENCRYPT_SIDE_ONLY:
encrypt = &ssl->encrypt; enc = &ssl->encrypt;
break; break;
case DECRYPT_SIDE_ONLY: case DECRYPT_SIDE_ONLY:
decrypt = &ssl->decrypt; dec = &ssl->decrypt;
break; break;
case ENCRYPT_AND_DECRYPT_SIDE: case ENCRYPT_AND_DECRYPT_SIDE:
encrypt = &ssl->encrypt; enc = &ssl->encrypt;
decrypt = &ssl->decrypt; dec = &ssl->decrypt;
break; break;
default: default:
@@ -2368,16 +2368,16 @@ int SetKeysSide(CYASSL* ssl, enum encrypt_side side)
} }
#endif #endif
ret = SetKeys(encrypt, decrypt, keys, &ssl->specs, ssl->options.side, ret = SetKeys(enc, dec, keys, &ssl->specs, ssl->options.side,
ssl->heap, devId); ssl->heap, devId);
#ifdef HAVE_SECURE_RENEGOTIATION #ifdef HAVE_SECURE_RENEGOTIATION
if (copy) { if (copy) {
int clientCopy = 0; int clientCopy = 0;
if (ssl->options.side == CYASSL_CLIENT_END && encrypt) if (ssl->options.side == CYASSL_CLIENT_END && enc)
clientCopy = 1; clientCopy = 1;
else if (ssl->options.side == CYASSL_SERVER_END && decrypt) else if (ssl->options.side == CYASSL_SERVER_END && dec)
clientCopy = 1; clientCopy = 1;
if (clientCopy) { if (clientCopy) {
@@ -2395,7 +2395,7 @@ int SetKeysSide(CYASSL* ssl, enum encrypt_side side)
XMEMCPY(ssl->keys.server_write_IV, XMEMCPY(ssl->keys.server_write_IV,
keys->server_write_IV, AES_IV_SIZE); keys->server_write_IV, AES_IV_SIZE);
} }
if (encrypt) { if (enc) {
ssl->keys.sequence_number = keys->sequence_number; ssl->keys.sequence_number = keys->sequence_number;
#ifdef HAVE_AEAD #ifdef HAVE_AEAD
if (ssl->specs.cipher_type == aead) { if (ssl->specs.cipher_type == aead) {
@@ -2405,7 +2405,7 @@ int SetKeysSide(CYASSL* ssl, enum encrypt_side side)
} }
#endif #endif
} }
if (decrypt) if (dec)
ssl->keys.peer_sequence_number = keys->peer_sequence_number; ssl->keys.peer_sequence_number = keys->peer_sequence_number;
ssl->secure_renegotiation->cache_status++; ssl->secure_renegotiation->cache_status++;
} }