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

fix integration bugs with new suites

Browse Source
This commit is contained in:
John Safranek
2014-05-20 14:07:08 -07:00
parent b889191992
commit 12841e6093
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cyassl/internal.h
View File

@ -243,7 +243,7 @@ void c32to24(word32 in, word24 out);
#endif #endif
#endif #endif
#ifdef CYASSL_SHA384 #ifdef CYASSL_SHA384
#define BUILD_TLS_PSK_WITH_AES_128_CBC_SHA384 #define BUILD_TLS_PSK_WITH_AES_256_CBC_SHA384
#ifdef HAVE_AESGCM #ifdef HAVE_AESGCM
#define BUILD_TLS_PSK_WITH_AES_256_GCM_SHA384 #define BUILD_TLS_PSK_WITH_AES_256_GCM_SHA384
#endif #endif

14
src/keys.c
View File

@ -939,8 +939,8 @@ int SetCipherSpecs(CYASSL* ssl)
#ifdef BUILD_TLS_PSK_WITH_AES_128_GCM_SHA256 #ifdef BUILD_TLS_PSK_WITH_AES_128_GCM_SHA256
case TLS_PSK_WITH_AES_128_GCM_SHA256 : case TLS_PSK_WITH_AES_128_GCM_SHA256 :
ssl->specs.bulk_cipher_algorithm = cyassl_aes; ssl->specs.bulk_cipher_algorithm = cyassl_aes_gcm;
ssl->specs.cipher_type = block; ssl->specs.cipher_type = aead;
ssl->specs.mac_algorithm = sha256_mac; ssl->specs.mac_algorithm = sha256_mac;
ssl->specs.kea = psk_kea; ssl->specs.kea = psk_kea;
ssl->specs.sig_algo = anonymous_sa_algo; ssl->specs.sig_algo = anonymous_sa_algo;
@ -949,7 +949,8 @@ int SetCipherSpecs(CYASSL* ssl)
ssl->specs.static_ecdh = 0; ssl->specs.static_ecdh = 0;
ssl->specs.key_size = AES_128_KEY_SIZE; ssl->specs.key_size = AES_128_KEY_SIZE;
ssl->specs.block_size = AES_BLOCK_SIZE; ssl->specs.block_size = AES_BLOCK_SIZE;
ssl->specs.iv_size = AES_IV_SIZE; ssl->specs.iv_size = AEAD_IMP_IV_SZ;
ssl->specs.aead_mac_size = AES_GCM_AUTH_SZ;
ssl->options.usingPSK_cipher = 1; ssl->options.usingPSK_cipher = 1;
break; break;
@ -957,8 +958,8 @@ int SetCipherSpecs(CYASSL* ssl)
#ifdef BUILD_TLS_PSK_WITH_AES_256_GCM_SHA384 #ifdef BUILD_TLS_PSK_WITH_AES_256_GCM_SHA384
case TLS_PSK_WITH_AES_256_GCM_SHA384 : case TLS_PSK_WITH_AES_256_GCM_SHA384 :
ssl->specs.bulk_cipher_algorithm = cyassl_aes; ssl->specs.bulk_cipher_algorithm = cyassl_aes_gcm;
ssl->specs.cipher_type = block; ssl->specs.cipher_type = aead;
ssl->specs.mac_algorithm = sha384_mac; ssl->specs.mac_algorithm = sha384_mac;
ssl->specs.kea = psk_kea; ssl->specs.kea = psk_kea;
ssl->specs.sig_algo = anonymous_sa_algo; ssl->specs.sig_algo = anonymous_sa_algo;
@ -967,7 +968,8 @@ int SetCipherSpecs(CYASSL* ssl)
ssl->specs.static_ecdh = 0; ssl->specs.static_ecdh = 0;
ssl->specs.key_size = AES_256_KEY_SIZE; ssl->specs.key_size = AES_256_KEY_SIZE;
ssl->specs.block_size = AES_BLOCK_SIZE; ssl->specs.block_size = AES_BLOCK_SIZE;
ssl->specs.iv_size = AES_IV_SIZE; ssl->specs.iv_size = AEAD_IMP_IV_SZ;
ssl->specs.aead_mac_size = AES_GCM_AUTH_SZ;
ssl->options.usingPSK_cipher = 1; ssl->options.usingPSK_cipher = 1;
break; break;