From 17a92e76d37bfd31d549fd66d7a54aebe9c106d7 Mon Sep 17 00:00:00 2001 From: toddouska Date: Wed, 8 Aug 2012 15:37:00 -0700 Subject: [PATCH] add aesgcm openssl, and fix requires to use our local enum for aesgcm --- src/internal.c | 22 +++++++++++----------- tests/include.am | 3 ++- tests/suites.c | 13 ++++++++++++- tests/test-aesgcm-openssl.conf | 16 ++++++++++++++++ 4 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 tests/test-aesgcm-openssl.conf diff --git a/src/internal.c b/src/internal.c index b99309a17..ae5169e19 100644 --- a/src/internal.c +++ b/src/internal.c @@ -5921,44 +5921,44 @@ int SetCipherList(Suites* s, const char* list) break; case TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 : - if (requirement == ecc_dsa_sa_algo) + if (requirement == REQUIRES_ECC_DSA) return 1; break; case TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 : - if (requirement == ecc_dsa_sa_algo) + if (requirement == REQUIRES_ECC_DSA) return 1; break; case TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 : - if (requirement == ecc_static_diffie_hellman_kea) + if (requirement == REQUIRES_ECC_STATIC) return 1; break; case TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 : - if (requirement == ecc_static_diffie_hellman_kea) + if (requirement == REQUIRES_ECC_STATIC) return 1; break; case TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 : - if (requirement == rsa_kea) + if (requirement == REQUIRES_RSA) return 1; break; case TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 : - if (requirement == rsa_kea) + if (requirement == REQUIRES_RSA) return 1; break; case TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256 : - if (requirement == ecc_static_diffie_hellman_kea) + if (requirement == REQUIRES_ECC_STATIC) return 1; if (requirement == REQUIRES_RSA_SIG) return 1; break; case TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384 : - if (requirement == ecc_static_diffie_hellman_kea) + if (requirement == REQUIRES_ECC_STATIC) return 1; if (requirement == REQUIRES_RSA_SIG) return 1; @@ -6082,15 +6082,15 @@ int SetCipherList(Suites* s, const char* list) case TLS_RSA_WITH_AES_128_GCM_SHA256 : case TLS_RSA_WITH_AES_256_GCM_SHA384 : - if (requirement == rsa_kea) + if (requirement == REQUIRES_RSA) return 1; break; case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 : case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 : - if (requirement == rsa_kea) + if (requirement == REQUIRES_RSA) return 1; - if (requirement == diffie_hellman_kea) + if (requirement == REQUIRES_DHE) return 1; break; diff --git a/tests/include.am b/tests/include.am index 52813189a..6ce2bf6e5 100644 --- a/tests/include.am +++ b/tests/include.am @@ -22,4 +22,5 @@ EXTRA_DIST += tests/test.conf \ tests/test-psk.conf \ tests/test-ntru.conf \ tests/test-ecc.conf \ - tests/test-aesgcm.conf + tests/test-aesgcm.conf \ + tests/test-aesgcm-openssl.conf diff --git a/tests/suites.c b/tests/suites.c index d42c82d2e..5a3c672c9 100644 --- a/tests/suites.c +++ b/tests/suites.c @@ -292,7 +292,7 @@ int SuiteTest(void) #endif #ifdef HAVE_AESGCM - /* add ecc extra suites */ + /* add aesgcm extra suites */ strcpy(argv0[1], "tests/test-aesgcm.conf"); printf("starting aesgcm extra cipher suite tests\n"); test_harness(&args); @@ -302,6 +302,17 @@ int SuiteTest(void) } #endif +#if defined(HAVE_AESGCM) && defined(OPENSSL_EXTRA) + /* add aesgcm openssl extra suites */ + strcpy(argv0[1], "tests/test-aesgcm-openssl.conf"); + printf("starting aesgcm openssl extra cipher suite tests\n"); + test_harness(&args); + if (args.return_code != 0) { + printf("error from script %d\n", args.return_code); + exit(EXIT_FAILURE); + } +#endif + printf(" End Cipher Suite Tests\n"); return args.return_code; diff --git a/tests/test-aesgcm-openssl.conf b/tests/test-aesgcm-openssl.conf new file mode 100644 index 000000000..006e27216 --- /dev/null +++ b/tests/test-aesgcm-openssl.conf @@ -0,0 +1,16 @@ +# server TLSv1.2 DHE-RSA-AES128-GCM-SHA256 +-v 3 +-l DHE-RSA-AES128-GCM-SHA256 + +# client TLSv1.2 DHE-RSA-AES128-GCM-SHA256 +-v 3 +-l DHE-RSA-AES128-GCM-SHA256 + +# server TLSv1.2 DHE-RSA-AES256-GCM-SHA384 +-v 3 +-l DHE-RSA-AES256-GCM-SHA384 + +# client TLSv1.2 DHE-RSA-AES256-GCM-SHA384 +-v 3 +-l DHE-RSA-AES256-GCM-SHA384 +