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

cipher suite setup oversight fixes

Browse Source
This commit is contained in:
John Safranek
2012-06-28 23:09:13 -07:00
parent 2ce28d0328
commit 5dc0303dee
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@@ -3954,7 +3954,7 @@ const char* const cipher_names[] =
#endif #endif
#ifdef BUILD_TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384 #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
"ECDH-RSA-AES128-GCM-SHA384", "ECDH-RSA-AES256-GCM-SHA384",
#endif #endif
#ifdef BUILD_TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 #ifdef BUILD_TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
@@ -4129,7 +4129,7 @@ int cipher_name_idx[] =
TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
#endif #endif
#ifdef BUILD_DHE_TLS_RSA_WITH_AES_256_GCM_SHA384 #ifdef BUILD_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
TLS_DHE_RSA_WITH_AES_256_GCM_SHA384, TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
#endif #endif

36
src/keys.c
View File

@@ -788,6 +788,7 @@ int SetCipherSpecs(CYASSL* ssl)
ssl->specs.cipher_type = aead; ssl->specs.cipher_type = aead;
ssl->specs.mac_algorithm = sha256_mac; ssl->specs.mac_algorithm = sha256_mac;
ssl->specs.kea = rsa_kea; ssl->specs.kea = rsa_kea;
ssl->specs.sig_algo = rsa_sa_algo;
ssl->specs.hash_size = SHA256_DIGEST_SIZE; ssl->specs.hash_size = SHA256_DIGEST_SIZE;
ssl->specs.pad_size = PAD_SHA; ssl->specs.pad_size = PAD_SHA;
ssl->specs.static_ecdh = 0; ssl->specs.static_ecdh = 0;
@@ -804,6 +805,41 @@ int SetCipherSpecs(CYASSL* ssl)
ssl->specs.cipher_type = aead; ssl->specs.cipher_type = aead;
ssl->specs.mac_algorithm = sha384_mac; ssl->specs.mac_algorithm = sha384_mac;
ssl->specs.kea = rsa_kea; ssl->specs.kea = rsa_kea;
ssl->specs.sig_algo = rsa_sa_algo;
ssl->specs.hash_size = SHA384_DIGEST_SIZE;
ssl->specs.pad_size = PAD_SHA;
ssl->specs.static_ecdh = 0;
ssl->specs.key_size = AES_256_KEY_SIZE;
ssl->specs.block_size = AES_BLOCK_SIZE;
ssl->specs.iv_size = AES_GCM_IMPLICIT_IV_SIZE;
break;
#endif
#ifdef BUILD_TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 :
ssl->specs.bulk_cipher_algorithm = aes_gcm;
ssl->specs.cipher_type = aead;
ssl->specs.mac_algorithm = sha256_mac;
ssl->specs.kea = diffie_hellman_kea;
ssl->specs.sig_algo = rsa_sa_algo;
ssl->specs.hash_size = SHA256_DIGEST_SIZE;
ssl->specs.pad_size = PAD_SHA;
ssl->specs.static_ecdh = 0;
ssl->specs.key_size = AES_128_KEY_SIZE;
ssl->specs.block_size = AES_BLOCK_SIZE;
ssl->specs.iv_size = AES_GCM_IMPLICIT_IV_SIZE;
break;
#endif
#ifdef BUILD_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 :
ssl->specs.bulk_cipher_algorithm = aes_gcm;
ssl->specs.cipher_type = aead;
ssl->specs.mac_algorithm = sha384_mac;
ssl->specs.kea = diffie_hellman_kea;
ssl->specs.sig_algo = rsa_sa_algo;
ssl->specs.hash_size = SHA384_DIGEST_SIZE; ssl->specs.hash_size = SHA384_DIGEST_SIZE;
ssl->specs.pad_size = PAD_SHA; ssl->specs.pad_size = PAD_SHA;
ssl->specs.static_ecdh = 0; ssl->specs.static_ecdh = 0;