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

encrypt shadowing global in unistd.h fix

Browse Source
This commit is contained in:
kaleb-himes
2015-01-28 11:18:13 -07:00
parent 7dba293fbb
commit 81b6c7ff7a
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/keys.c
View File

@@ -2324,12 +2324,15 @@ static int SetAuthKeys(OneTimeAuth* authentication, Keys* keys,
#endif /* HAVE_ONE_TIME_AUTH */ #endif /* HAVE_ONE_TIME_AUTH */
/* Set encrypt/decrypt or both sides of key setup */ /* Set wc_encrypt/wc_decrypt or both sides of key setup
* note: use wc_encrypt to avoid shadowing global encrypt
* declared in unistd.h
*/
int SetKeysSide(WOLFSSL* ssl, enum encrypt_side side) int SetKeysSide(WOLFSSL* 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* wc_encrypt = NULL;
Ciphers* decrypt = NULL; Ciphers* wc_decrypt = NULL;
Keys* keys = &ssl->keys; Keys* keys = &ssl->keys;
(void)copy; (void)copy;
@@ -2347,16 +2350,16 @@ int SetKeysSide(WOLFSSL* ssl, enum encrypt_side side)
switch (side) { switch (side) {
case ENCRYPT_SIDE_ONLY: case ENCRYPT_SIDE_ONLY:
encrypt = &ssl->encrypt; wc_encrypt = &ssl->encrypt;
break; break;
case DECRYPT_SIDE_ONLY: case DECRYPT_SIDE_ONLY:
decrypt = &ssl->decrypt; wc_decrypt = &ssl->decrypt;
break; break;
case ENCRYPT_AND_DECRYPT_SIDE: case ENCRYPT_AND_DECRYPT_SIDE:
encrypt = &ssl->encrypt; wc_encrypt = &ssl->encrypt;
decrypt = &ssl->decrypt; wc_decrypt = &ssl->decrypt;
break; break;
default: default:
@@ -2371,16 +2374,16 @@ int SetKeysSide(WOLFSSL* ssl, enum encrypt_side side)
} }
#endif #endif
ret = SetKeys(encrypt, decrypt, keys, &ssl->specs, ssl->options.side, ret = SetKeys(wc_encrypt, wc_decrypt, 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 == WOLFSSL_CLIENT_END && encrypt) if (ssl->options.side == WOLFSSL_CLIENT_END && wc_encrypt)
clientCopy = 1; clientCopy = 1;
else if (ssl->options.side == WOLFSSL_SERVER_END && decrypt) else if (ssl->options.side == WOLFSSL_SERVER_END && wc_decrypt)
clientCopy = 1; clientCopy = 1;
if (clientCopy) { if (clientCopy) {
@@ -2398,7 +2401,7 @@ int SetKeysSide(WOLFSSL* 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 (wc_encrypt) {
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) {
@@ -2408,7 +2411,7 @@ int SetKeysSide(WOLFSSL* ssl, enum encrypt_side side)
} }
#endif #endif
} }
if (decrypt) if (wc_decrypt)
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++;
} }