diff --git a/src/internal.c b/src/internal.c index a65b2365c..d47316f25 100644 --- a/src/internal.c +++ b/src/internal.c @@ -15437,10 +15437,10 @@ void SetErrorString(int error, char* str) XSTRNCPY(str, wolfSSL_ERR_reason_error_string(error), WOLFSSL_MAX_ERROR_SZ); } -#ifdef NO_ERROR_STRINGS - #define NAME_IANA(name) NULL +#ifndef NO_ERROR_STRINGS + #define SUITE_INFO(x,y,z,w) {(x),(y),(z),(w)} #else - #define NAME_IANA(name) name + #define SUITE_INFO(x,y,z,w) {(x),(z),(w)} #endif static const CipherSuiteInfo cipher_names[] = @@ -15448,478 +15448,476 @@ static const CipherSuiteInfo cipher_names[] = #ifndef WOLFSSL_NO_TLS12 #ifdef BUILD_SSL_RSA_WITH_RC4_128_SHA - {"RC4-SHA", NAME_IANA("SSL_RSA_WITH_RC4_128_SHA"), CIPHER_BYTE, SSL_RSA_WITH_RC4_128_SHA}, + SUITE_INFO("RC4-SHA","SSL_RSA_WITH_RC4_128_SHA",CIPHER_BYTE,SSL_RSA_WITH_RC4_128_SHA), #endif #ifdef BUILD_SSL_RSA_WITH_RC4_128_MD5 - {"RC4-MD5", NAME_IANA("SSL_RSA_WITH_RC4_128_MD5"), CIPHER_BYTE, SSL_RSA_WITH_RC4_128_MD5}, + SUITE_INFO("RC4-MD5","SSL_RSA_WITH_RC4_128_MD5",CIPHER_BYTE,SSL_RSA_WITH_RC4_128_MD5), #endif #ifdef BUILD_SSL_RSA_WITH_3DES_EDE_CBC_SHA - {"DES-CBC3-SHA", NAME_IANA("SSL_RSA_WITH_3DES_EDE_CBC_SHA"), CIPHER_BYTE, SSL_RSA_WITH_3DES_EDE_CBC_SHA}, + SUITE_INFO("DES-CBC3-SHA","SSL_RSA_WITH_3DES_EDE_CBC_SHA",CIPHER_BYTE,SSL_RSA_WITH_3DES_EDE_CBC_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_AES_128_CBC_SHA - {"AES128-SHA", NAME_IANA("TLS_RSA_WITH_AES_128_CBC_SHA"), CIPHER_BYTE, TLS_RSA_WITH_AES_128_CBC_SHA}, + SUITE_INFO("AES128-SHA","TLS_RSA_WITH_AES_128_CBC_SHA",CIPHER_BYTE,TLS_RSA_WITH_AES_128_CBC_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_AES_256_CBC_SHA - {"AES256-SHA", NAME_IANA("TLS_RSA_WITH_AES_256_CBC_SHA"), CIPHER_BYTE, TLS_RSA_WITH_AES_256_CBC_SHA}, + SUITE_INFO("AES256-SHA","TLS_RSA_WITH_AES_256_CBC_SHA",CIPHER_BYTE,TLS_RSA_WITH_AES_256_CBC_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_NULL_SHA - {"NULL-SHA", NAME_IANA("TLS_RSA_WITH_NULL_SHA"), CIPHER_BYTE, TLS_RSA_WITH_NULL_SHA}, + SUITE_INFO("NULL-SHA","TLS_RSA_WITH_NULL_SHA",CIPHER_BYTE,TLS_RSA_WITH_NULL_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_NULL_SHA256 - {"NULL-SHA256", NAME_IANA("TLS_RSA_WITH_NULL_SHA256"), CIPHER_BYTE, TLS_RSA_WITH_NULL_SHA256}, + SUITE_INFO("NULL-SHA256","TLS_RSA_WITH_NULL_SHA256",CIPHER_BYTE,TLS_RSA_WITH_NULL_SHA256), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_AES_128_CBC_SHA - {"DHE-RSA-AES128-SHA", NAME_IANA("TLS_DHE_RSA_WITH_AES_128_CBC_SHA"), CIPHER_BYTE, TLS_DHE_RSA_WITH_AES_128_CBC_SHA}, + SUITE_INFO("DHE-RSA-AES128-SHA","TLS_DHE_RSA_WITH_AES_128_CBC_SHA",CIPHER_BYTE,TLS_DHE_RSA_WITH_AES_128_CBC_SHA), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_AES_256_CBC_SHA - {"DHE-RSA-AES256-SHA", NAME_IANA("TLS_DHE_RSA_WITH_AES_256_CBC_SHA"), CIPHER_BYTE, TLS_DHE_RSA_WITH_AES_256_CBC_SHA}, + SUITE_INFO("DHE-RSA-AES256-SHA","TLS_DHE_RSA_WITH_AES_256_CBC_SHA",CIPHER_BYTE,TLS_DHE_RSA_WITH_AES_256_CBC_SHA), #endif #ifdef BUILD_TLS_DHE_PSK_WITH_AES_256_GCM_SHA384 - {"DHE-PSK-AES256-GCM-SHA384", NAME_IANA("TLS_DHE_PSK_WITH_AES_256_GCM_SHA384"), CIPHER_BYTE, TLS_DHE_PSK_WITH_AES_256_GCM_SHA384}, + SUITE_INFO("DHE-PSK-AES256-GCM-SHA384","TLS_DHE_PSK_WITH_AES_256_GCM_SHA384",CIPHER_BYTE,TLS_DHE_PSK_WITH_AES_256_GCM_SHA384), #endif #ifdef BUILD_TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 - {"DHE-PSK-AES128-GCM-SHA256", NAME_IANA("TLS_DHE_PSK_WITH_AES_128_GCM_SHA256"), CIPHER_BYTE, TLS_DHE_PSK_WITH_AES_128_GCM_SHA256}, + SUITE_INFO("DHE-PSK-AES128-GCM-SHA256","TLS_DHE_PSK_WITH_AES_128_GCM_SHA256",CIPHER_BYTE,TLS_DHE_PSK_WITH_AES_128_GCM_SHA256), #endif #ifdef BUILD_TLS_PSK_WITH_AES_256_GCM_SHA384 - {"PSK-AES256-GCM-SHA384", NAME_IANA("TLS_PSK_WITH_AES_256_GCM_SHA384"), CIPHER_BYTE, TLS_PSK_WITH_AES_256_GCM_SHA384}, + SUITE_INFO("PSK-AES256-GCM-SHA384","TLS_PSK_WITH_AES_256_GCM_SHA384",CIPHER_BYTE,TLS_PSK_WITH_AES_256_GCM_SHA384), #endif #ifdef BUILD_TLS_PSK_WITH_AES_128_GCM_SHA256 - {"PSK-AES128-GCM-SHA256", NAME_IANA("TLS_PSK_WITH_AES_128_GCM_SHA256"), CIPHER_BYTE, TLS_PSK_WITH_AES_128_GCM_SHA256}, + SUITE_INFO("PSK-AES128-GCM-SHA256","TLS_PSK_WITH_AES_128_GCM_SHA256",CIPHER_BYTE,TLS_PSK_WITH_AES_128_GCM_SHA256), #endif #ifdef BUILD_TLS_DHE_PSK_WITH_AES_256_CBC_SHA384 - {"DHE-PSK-AES256-CBC-SHA384", NAME_IANA("TLS_DHE_PSK_WITH_AES_256_CBC_SHA384"), CIPHER_BYTE, TLS_DHE_PSK_WITH_AES_256_CBC_SHA384}, + SUITE_INFO("DHE-PSK-AES256-CBC-SHA384","TLS_DHE_PSK_WITH_AES_256_CBC_SHA384",CIPHER_BYTE,TLS_DHE_PSK_WITH_AES_256_CBC_SHA384), #endif #ifdef BUILD_TLS_DHE_PSK_WITH_AES_128_CBC_SHA256 - {"DHE-PSK-AES128-CBC-SHA256", NAME_IANA("TLS_DHE_PSK_WITH_AES_128_CBC_SHA256"), CIPHER_BYTE, TLS_DHE_PSK_WITH_AES_128_CBC_SHA256}, + SUITE_INFO("DHE-PSK-AES128-CBC-SHA256","TLS_DHE_PSK_WITH_AES_128_CBC_SHA256",CIPHER_BYTE,TLS_DHE_PSK_WITH_AES_128_CBC_SHA256), #endif #ifdef BUILD_TLS_PSK_WITH_AES_256_CBC_SHA384 - {"PSK-AES256-CBC-SHA384", NAME_IANA("TLS_PSK_WITH_AES_256_CBC_SHA384"), CIPHER_BYTE, TLS_PSK_WITH_AES_256_CBC_SHA384}, + SUITE_INFO("PSK-AES256-CBC-SHA384","TLS_PSK_WITH_AES_256_CBC_SHA384",CIPHER_BYTE,TLS_PSK_WITH_AES_256_CBC_SHA384), #endif #ifdef BUILD_TLS_PSK_WITH_AES_128_CBC_SHA256 - {"PSK-AES128-CBC-SHA256", NAME_IANA("TLS_PSK_WITH_AES_128_CBC_SHA256"), CIPHER_BYTE, TLS_PSK_WITH_AES_128_CBC_SHA256}, + SUITE_INFO("PSK-AES128-CBC-SHA256","TLS_PSK_WITH_AES_128_CBC_SHA256",CIPHER_BYTE,TLS_PSK_WITH_AES_128_CBC_SHA256), #endif #ifdef BUILD_TLS_PSK_WITH_AES_128_CBC_SHA - {"PSK-AES128-CBC-SHA", NAME_IANA("TLS_PSK_WITH_AES_128_CBC_SHA"), CIPHER_BYTE, TLS_PSK_WITH_AES_128_CBC_SHA}, + SUITE_INFO("PSK-AES128-CBC-SHA","TLS_PSK_WITH_AES_128_CBC_SHA",CIPHER_BYTE,TLS_PSK_WITH_AES_128_CBC_SHA), #endif #ifdef BUILD_TLS_PSK_WITH_AES_256_CBC_SHA - {"PSK-AES256-CBC-SHA", NAME_IANA("TLS_PSK_WITH_AES_256_CBC_SHA"), CIPHER_BYTE, TLS_PSK_WITH_AES_256_CBC_SHA}, + SUITE_INFO("PSK-AES256-CBC-SHA","TLS_PSK_WITH_AES_256_CBC_SHA",CIPHER_BYTE,TLS_PSK_WITH_AES_256_CBC_SHA), #endif #ifdef BUILD_TLS_DHE_PSK_WITH_AES_128_CCM - {"DHE-PSK-AES128-CCM", NAME_IANA("TLS_DHE_PSK_WITH_AES_128_CCM"), ECC_BYTE, TLS_DHE_PSK_WITH_AES_128_CCM}, + SUITE_INFO("DHE-PSK-AES128-CCM","TLS_DHE_PSK_WITH_AES_128_CCM",ECC_BYTE,TLS_DHE_PSK_WITH_AES_128_CCM), #endif #ifdef BUILD_TLS_DHE_PSK_WITH_AES_256_CCM - {"DHE-PSK-AES256-CCM", NAME_IANA("TLS_DHE_PSK_WITH_AES_256_CCM"), ECC_BYTE, TLS_DHE_PSK_WITH_AES_256_CCM}, + SUITE_INFO("DHE-PSK-AES256-CCM","TLS_DHE_PSK_WITH_AES_256_CCM",ECC_BYTE,TLS_DHE_PSK_WITH_AES_256_CCM), #endif #ifdef BUILD_TLS_PSK_WITH_AES_128_CCM - {"PSK-AES128-CCM", NAME_IANA("TLS_PSK_WITH_AES_128_CCM"), ECC_BYTE, TLS_PSK_WITH_AES_128_CCM}, + SUITE_INFO("PSK-AES128-CCM","TLS_PSK_WITH_AES_128_CCM",ECC_BYTE,TLS_PSK_WITH_AES_128_CCM), #endif #ifdef BUILD_TLS_PSK_WITH_AES_256_CCM - {"PSK-AES256-CCM", NAME_IANA("TLS_PSK_WITH_AES_256_CCM"), ECC_BYTE, TLS_PSK_WITH_AES_256_CCM}, + SUITE_INFO("PSK-AES256-CCM","TLS_PSK_WITH_AES_256_CCM",ECC_BYTE,TLS_PSK_WITH_AES_256_CCM), #endif #ifdef BUILD_TLS_PSK_WITH_AES_128_CCM_8 - {"PSK-AES128-CCM-8", NAME_IANA("TLS_PSK_WITH_AES_128_CCM_8"), ECC_BYTE, TLS_PSK_WITH_AES_128_CCM_8}, + SUITE_INFO("PSK-AES128-CCM-8","TLS_PSK_WITH_AES_128_CCM_8",ECC_BYTE,TLS_PSK_WITH_AES_128_CCM_8), #endif #ifdef BUILD_TLS_PSK_WITH_AES_256_CCM_8 - {"PSK-AES256-CCM-8", NAME_IANA("TLS_PSK_WITH_AES_256_CCM_8"), ECC_BYTE, TLS_PSK_WITH_AES_256_CCM_8}, + SUITE_INFO("PSK-AES256-CCM-8","TLS_PSK_WITH_AES_256_CCM_8",ECC_BYTE,TLS_PSK_WITH_AES_256_CCM_8), #endif #ifdef BUILD_TLS_DHE_PSK_WITH_NULL_SHA384 - {"DHE-PSK-NULL-SHA384", NAME_IANA("TLS_DHE_PSK_WITH_NULL_SHA384"), CIPHER_BYTE, TLS_DHE_PSK_WITH_NULL_SHA384}, + SUITE_INFO("DHE-PSK-NULL-SHA384","TLS_DHE_PSK_WITH_NULL_SHA384",CIPHER_BYTE,TLS_DHE_PSK_WITH_NULL_SHA384), #endif #ifdef BUILD_TLS_DHE_PSK_WITH_NULL_SHA256 - {"DHE-PSK-NULL-SHA256", NAME_IANA("TLS_DHE_PSK_WITH_NULL_SHA256"), CIPHER_BYTE, TLS_DHE_PSK_WITH_NULL_SHA256}, + SUITE_INFO("DHE-PSK-NULL-SHA256","TLS_DHE_PSK_WITH_NULL_SHA256",CIPHER_BYTE,TLS_DHE_PSK_WITH_NULL_SHA256), #endif #ifdef BUILD_TLS_PSK_WITH_NULL_SHA384 - {"PSK-NULL-SHA384", NAME_IANA("TLS_PSK_WITH_NULL_SHA384"), CIPHER_BYTE, TLS_PSK_WITH_NULL_SHA384}, + SUITE_INFO("PSK-NULL-SHA384","TLS_PSK_WITH_NULL_SHA384",CIPHER_BYTE,TLS_PSK_WITH_NULL_SHA384), #endif #ifdef BUILD_TLS_PSK_WITH_NULL_SHA256 - {"PSK-NULL-SHA256", NAME_IANA("TLS_PSK_WITH_NULL_SHA256"), CIPHER_BYTE, TLS_PSK_WITH_NULL_SHA256}, + SUITE_INFO("PSK-NULL-SHA256","TLS_PSK_WITH_NULL_SHA256",CIPHER_BYTE,TLS_PSK_WITH_NULL_SHA256), #endif #ifdef BUILD_TLS_PSK_WITH_NULL_SHA - {"PSK-NULL-SHA", NAME_IANA("TLS_PSK_WITH_NULL_SHA"), CIPHER_BYTE, TLS_PSK_WITH_NULL_SHA}, + SUITE_INFO("PSK-NULL-SHA","TLS_PSK_WITH_NULL_SHA",CIPHER_BYTE,TLS_PSK_WITH_NULL_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_HC_128_MD5 - {"HC128-MD5", NAME_IANA("TLS_RSA_WITH_HC_128_MD5"), CIPHER_BYTE, TLS_RSA_WITH_HC_128_MD5}, + SUITE_INFO("HC128-MD5","TLS_RSA_WITH_HC_128_MD5",CIPHER_BYTE,TLS_RSA_WITH_HC_128_MD5), #endif #ifdef BUILD_TLS_RSA_WITH_HC_128_SHA - {"HC128-SHA", NAME_IANA("TLS_RSA_WITH_HC_128_SHA"), CIPHER_BYTE, TLS_RSA_WITH_HC_128_SHA}, + SUITE_INFO("HC128-SHA","TLS_RSA_WITH_HC_128_SHA",CIPHER_BYTE,TLS_RSA_WITH_HC_128_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_HC_128_B2B256 - {"HC128-B2B256", NAME_IANA("TLS_RSA_WITH_HC_128_B2B256"), CIPHER_BYTE, TLS_RSA_WITH_HC_128_B2B256}, + SUITE_INFO("HC128-B2B256","TLS_RSA_WITH_HC_128_B2B256",CIPHER_BYTE,TLS_RSA_WITH_HC_128_B2B256), #endif #ifdef BUILD_TLS_RSA_WITH_AES_128_CBC_B2B256 - {"AES128-B2B256", NAME_IANA("TLS_RSA_WITH_AES_128_CBC_B2B256"), CIPHER_BYTE, TLS_RSA_WITH_AES_128_CBC_B2B256}, + SUITE_INFO("AES128-B2B256","TLS_RSA_WITH_AES_128_CBC_B2B256",CIPHER_BYTE,TLS_RSA_WITH_AES_128_CBC_B2B256), #endif #ifdef BUILD_TLS_RSA_WITH_AES_256_CBC_B2B256 - {"AES256-B2B256", NAME_IANA("TLS_RSA_WITH_AES_256_CBC_B2B256"), CIPHER_BYTE, TLS_RSA_WITH_AES_256_CBC_B2B256}, + SUITE_INFO("AES256-B2B256","TLS_RSA_WITH_AES_256_CBC_B2B256",CIPHER_BYTE,TLS_RSA_WITH_AES_256_CBC_B2B256), #endif #ifdef BUILD_TLS_RSA_WITH_RABBIT_SHA - {"RABBIT-SHA", NAME_IANA("TLS_RSA_WITH_RABBIT_SHA"), CIPHER_BYTE, TLS_RSA_WITH_RABBIT_SHA}, + SUITE_INFO("RABBIT-SHA","TLS_RSA_WITH_RABBIT_SHA",CIPHER_BYTE,TLS_RSA_WITH_RABBIT_SHA), #endif #ifdef BUILD_TLS_NTRU_RSA_WITH_RC4_128_SHA - {"NTRU-RC4-SHA", NAME_IANA("TLS_NTRU_RSA_WITH_RC4_128_SHA"), CIPHER_BYTE, TLS_NTRU_RSA_WITH_RC4_128_SHA}, + SUITE_INFO("NTRU-RC4-SHA","TLS_NTRU_RSA_WITH_RC4_128_SHA",CIPHER_BYTE,TLS_NTRU_RSA_WITH_RC4_128_SHA), #endif #ifdef BUILD_TLS_NTRU_RSA_WITH_3DES_EDE_CBC_SHA - {"NTRU-DES-CBC3-SHA", NAME_IANA("TLS_NTRU_RSA_WITH_3DES_EDE_CBC_SHA"), CIPHER_BYTE, TLS_NTRU_RSA_WITH_3DES_EDE_CBC_SHA}, + SUITE_INFO("NTRU-DES-CBC3-SHA","TLS_NTRU_RSA_WITH_3DES_EDE_CBC_SHA",CIPHER_BYTE,TLS_NTRU_RSA_WITH_3DES_EDE_CBC_SHA), #endif #ifdef BUILD_TLS_NTRU_RSA_WITH_AES_128_CBC_SHA - {"NTRU-AES128-SHA", NAME_IANA("TLS_NTRU_RSA_WITH_AES_128_CBC_SHA"), CIPHER_BYTE, TLS_NTRU_RSA_WITH_AES_128_CBC_SHA}, + SUITE_INFO("NTRU-AES128-SHA","TLS_NTRU_RSA_WITH_AES_128_CBC_SHA",CIPHER_BYTE,TLS_NTRU_RSA_WITH_AES_128_CBC_SHA), #endif #ifdef BUILD_TLS_NTRU_RSA_WITH_AES_256_CBC_SHA - {"NTRU-AES256-SHA", NAME_IANA("TLS_NTRU_RSA_WITH_AES_256_CBC_SHA"), CIPHER_BYTE, TLS_NTRU_RSA_WITH_AES_256_CBC_SHA}, + SUITE_INFO("NTRU-AES256-SHA","TLS_NTRU_RSA_WITH_AES_256_CBC_SHA",CIPHER_BYTE,TLS_NTRU_RSA_WITH_AES_256_CBC_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_AES_128_CCM_8 - {"AES128-CCM-8", NAME_IANA("TLS_RSA_WITH_AES_128_CCM_8"), ECC_BYTE, TLS_RSA_WITH_AES_128_CCM_8}, + SUITE_INFO("AES128-CCM-8","TLS_RSA_WITH_AES_128_CCM_8",ECC_BYTE,TLS_RSA_WITH_AES_128_CCM_8), #endif #ifdef BUILD_TLS_RSA_WITH_AES_256_CCM_8 - {"AES256-CCM-8", NAME_IANA("TLS_RSA_WITH_AES_256_CCM_8"), ECC_BYTE, TLS_RSA_WITH_AES_256_CCM_8}, + SUITE_INFO("AES256-CCM-8","TLS_RSA_WITH_AES_256_CCM_8",ECC_BYTE,TLS_RSA_WITH_AES_256_CCM_8), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_128_CCM - {"ECDHE-ECDSA-AES128-CCM", NAME_IANA("TLS_ECDHE_ECDSA_WITH_AES_128_CCM"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_AES_128_CCM}, + SUITE_INFO("ECDHE-ECDSA-AES128-CCM","TLS_ECDHE_ECDSA_WITH_AES_128_CCM",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_AES_128_CCM), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 - {"ECDHE-ECDSA-AES128-CCM-8", NAME_IANA("TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8}, + SUITE_INFO("ECDHE-ECDSA-AES128-CCM-8","TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8 - {"ECDHE-ECDSA-AES256-CCM-8", NAME_IANA("TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8}, + SUITE_INFO("ECDHE-ECDSA-AES256-CCM-8","TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8), #endif #ifdef BUILD_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA - {"ECDHE-RSA-AES128-SHA", NAME_IANA("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"), ECC_BYTE, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA}, + SUITE_INFO("ECDHE-RSA-AES128-SHA","TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",ECC_BYTE,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA), #endif #ifdef BUILD_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA - {"ECDHE-RSA-AES256-SHA", NAME_IANA("TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"), ECC_BYTE, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA}, + SUITE_INFO("ECDHE-RSA-AES256-SHA","TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",ECC_BYTE,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA - {"ECDHE-ECDSA-AES128-SHA", NAME_IANA("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA}, + SUITE_INFO("ECDHE-ECDSA-AES128-SHA","TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA - {"ECDHE-ECDSA-AES256-SHA", NAME_IANA("TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA}, + SUITE_INFO("ECDHE-ECDSA-AES256-SHA","TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA), #endif #ifdef BUILD_TLS_ECDHE_RSA_WITH_RC4_128_SHA - {"ECDHE-RSA-RC4-SHA", NAME_IANA("TLS_ECDHE_RSA_WITH_RC4_128_SHA"), ECC_BYTE, TLS_ECDHE_RSA_WITH_RC4_128_SHA}, + SUITE_INFO("ECDHE-RSA-RC4-SHA","TLS_ECDHE_RSA_WITH_RC4_128_SHA",ECC_BYTE,TLS_ECDHE_RSA_WITH_RC4_128_SHA), #endif #ifdef BUILD_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA - {"ECDHE-RSA-DES-CBC3-SHA", NAME_IANA("TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"), ECC_BYTE, TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA}, + SUITE_INFO("ECDHE-RSA-DES-CBC3-SHA","TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",ECC_BYTE,TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_RC4_128_SHA - {"ECDHE-ECDSA-RC4-SHA", NAME_IANA("TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_RC4_128_SHA}, + SUITE_INFO("ECDHE-ECDSA-RC4-SHA","TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_RC4_128_SHA), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA - {"ECDHE-ECDSA-DES-CBC3-SHA", NAME_IANA("TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA}, + SUITE_INFO("ECDHE-ECDSA-DES-CBC3-SHA","TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_AES_128_CBC_SHA256 - {"AES128-SHA256", NAME_IANA("TLS_RSA_WITH_AES_128_CBC_SHA256"), CIPHER_BYTE, TLS_RSA_WITH_AES_128_CBC_SHA256}, + SUITE_INFO("AES128-SHA256","TLS_RSA_WITH_AES_128_CBC_SHA256",CIPHER_BYTE,TLS_RSA_WITH_AES_128_CBC_SHA256), #endif #ifdef BUILD_TLS_RSA_WITH_AES_256_CBC_SHA256 - {"AES256-SHA256", NAME_IANA("TLS_RSA_WITH_AES_256_CBC_SHA256"), CIPHER_BYTE, TLS_RSA_WITH_AES_256_CBC_SHA256}, + SUITE_INFO("AES256-SHA256","TLS_RSA_WITH_AES_256_CBC_SHA256",CIPHER_BYTE,TLS_RSA_WITH_AES_256_CBC_SHA256), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 - {"DHE-RSA-AES128-SHA256", NAME_IANA("TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"), CIPHER_BYTE, TLS_DHE_RSA_WITH_AES_128_CBC_SHA256}, + SUITE_INFO("DHE-RSA-AES128-SHA256","TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",CIPHER_BYTE,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 - {"DHE-RSA-AES256-SHA256", NAME_IANA("TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"), CIPHER_BYTE, TLS_DHE_RSA_WITH_AES_256_CBC_SHA256}, + SUITE_INFO("DHE-RSA-AES256-SHA256","TLS_DHE_RSA_WITH_AES_256_CBC_SHA256",CIPHER_BYTE,TLS_DHE_RSA_WITH_AES_256_CBC_SHA256), #endif #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA - {"ECDH-RSA-AES128-SHA", NAME_IANA("TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"), ECC_BYTE, TLS_ECDH_RSA_WITH_AES_128_CBC_SHA}, + SUITE_INFO("ECDH-RSA-AES128-SHA","TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",ECC_BYTE,TLS_ECDH_RSA_WITH_AES_128_CBC_SHA), #endif #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA - {"ECDH-RSA-AES256-SHA", NAME_IANA("TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"), ECC_BYTE, TLS_ECDH_RSA_WITH_AES_256_CBC_SHA}, + SUITE_INFO("ECDH-RSA-AES256-SHA","TLS_ECDH_RSA_WITH_AES_256_CBC_SHA",ECC_BYTE,TLS_ECDH_RSA_WITH_AES_256_CBC_SHA), #endif #ifdef BUILD_TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA - {"ECDH-ECDSA-AES128-SHA", NAME_IANA("TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"), ECC_BYTE, TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA}, + SUITE_INFO("ECDH-ECDSA-AES128-SHA","TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",ECC_BYTE,TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA), #endif #ifdef BUILD_TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA - {"ECDH-ECDSA-AES256-SHA", NAME_IANA("TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"), ECC_BYTE, TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA}, + SUITE_INFO("ECDH-ECDSA-AES256-SHA","TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA",ECC_BYTE,TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA), #endif #ifdef BUILD_TLS_ECDH_RSA_WITH_RC4_128_SHA - {"ECDH-RSA-RC4-SHA", NAME_IANA("TLS_ECDH_RSA_WITH_RC4_128_SHA"), ECC_BYTE, TLS_ECDH_RSA_WITH_RC4_128_SHA}, + SUITE_INFO("ECDH-RSA-RC4-SHA","TLS_ECDH_RSA_WITH_RC4_128_SHA",ECC_BYTE,TLS_ECDH_RSA_WITH_RC4_128_SHA), #endif #ifdef BUILD_TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA - {"ECDH-RSA-DES-CBC3-SHA", NAME_IANA("TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"), ECC_BYTE, TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA}, + SUITE_INFO("ECDH-RSA-DES-CBC3-SHA","TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",ECC_BYTE,TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA), #endif #ifdef BUILD_TLS_ECDH_ECDSA_WITH_RC4_128_SHA - {"ECDH-ECDSA-RC4-SHA", NAME_IANA("TLS_ECDH_ECDSA_WITH_RC4_128_SHA"), ECC_BYTE, TLS_ECDH_ECDSA_WITH_RC4_128_SHA}, + SUITE_INFO("ECDH-ECDSA-RC4-SHA","TLS_ECDH_ECDSA_WITH_RC4_128_SHA",ECC_BYTE,TLS_ECDH_ECDSA_WITH_RC4_128_SHA), #endif #ifdef BUILD_TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA - {"ECDH-ECDSA-DES-CBC3-SHA", NAME_IANA("TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"), ECC_BYTE, TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA}, + SUITE_INFO("ECDH-ECDSA-DES-CBC3-SHA","TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",ECC_BYTE,TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_AES_128_GCM_SHA256 - {"AES128-GCM-SHA256", NAME_IANA("TLS_RSA_WITH_AES_128_GCM_SHA256"), CIPHER_BYTE, TLS_RSA_WITH_AES_128_GCM_SHA256}, + SUITE_INFO("AES128-GCM-SHA256","TLS_RSA_WITH_AES_128_GCM_SHA256",CIPHER_BYTE,TLS_RSA_WITH_AES_128_GCM_SHA256), #endif #ifdef BUILD_TLS_RSA_WITH_AES_256_GCM_SHA384 - {"AES256-GCM-SHA384", NAME_IANA("TLS_RSA_WITH_AES_256_GCM_SHA384"), CIPHER_BYTE, TLS_RSA_WITH_AES_256_GCM_SHA384}, + SUITE_INFO("AES256-GCM-SHA384","TLS_RSA_WITH_AES_256_GCM_SHA384",CIPHER_BYTE,TLS_RSA_WITH_AES_256_GCM_SHA384), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 - {"DHE-RSA-AES128-GCM-SHA256", NAME_IANA("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"), CIPHER_BYTE, TLS_DHE_RSA_WITH_AES_128_GCM_SHA256}, + SUITE_INFO("DHE-RSA-AES128-GCM-SHA256","TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",CIPHER_BYTE,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 - {"DHE-RSA-AES256-GCM-SHA384", NAME_IANA("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"), CIPHER_BYTE, TLS_DHE_RSA_WITH_AES_256_GCM_SHA384}, + SUITE_INFO("DHE-RSA-AES256-GCM-SHA384","TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",CIPHER_BYTE,TLS_DHE_RSA_WITH_AES_256_GCM_SHA384), #endif #ifdef BUILD_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - {"ECDHE-RSA-AES128-GCM-SHA256", NAME_IANA("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"), ECC_BYTE, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256}, + SUITE_INFO("ECDHE-RSA-AES128-GCM-SHA256","TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",ECC_BYTE,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256), #endif #ifdef BUILD_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 - {"ECDHE-RSA-AES256-GCM-SHA384", NAME_IANA("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"), ECC_BYTE, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384}, + SUITE_INFO("ECDHE-RSA-AES256-GCM-SHA384","TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",ECC_BYTE,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 - {"ECDHE-ECDSA-AES128-GCM-SHA256", NAME_IANA("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256}, + SUITE_INFO("ECDHE-ECDSA-AES128-GCM-SHA256","TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 - {"ECDHE-ECDSA-AES256-GCM-SHA384", NAME_IANA("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384}, + SUITE_INFO("ECDHE-ECDSA-AES256-GCM-SHA384","TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384), #endif #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256 - {"ECDH-RSA-AES128-GCM-SHA256", NAME_IANA("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"), ECC_BYTE, TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256}, + SUITE_INFO("ECDH-RSA-AES128-GCM-SHA256","TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",ECC_BYTE,TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256), #endif #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384 - {"ECDH-RSA-AES256-GCM-SHA384", NAME_IANA("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"), ECC_BYTE, TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384}, + SUITE_INFO("ECDH-RSA-AES256-GCM-SHA384","TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",ECC_BYTE,TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384), #endif #ifdef BUILD_TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 - {"ECDH-ECDSA-AES128-GCM-SHA256", NAME_IANA("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"), ECC_BYTE, TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256}, + SUITE_INFO("ECDH-ECDSA-AES128-GCM-SHA256","TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",ECC_BYTE,TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256), #endif #ifdef BUILD_TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 - {"ECDH-ECDSA-AES256-GCM-SHA384", NAME_IANA("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"), ECC_BYTE, TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384}, + SUITE_INFO("ECDH-ECDSA-AES256-GCM-SHA384","TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",ECC_BYTE,TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384), #endif #ifdef BUILD_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA - {"CAMELLIA128-SHA", NAME_IANA("TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"), CIPHER_BYTE, TLS_RSA_WITH_CAMELLIA_128_CBC_SHA}, + SUITE_INFO("CAMELLIA128-SHA","TLS_RSA_WITH_CAMELLIA_128_CBC_SHA",CIPHER_BYTE,TLS_RSA_WITH_CAMELLIA_128_CBC_SHA), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA - {"DHE-RSA-CAMELLIA128-SHA", NAME_IANA("TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"), CIPHER_BYTE, TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA}, + SUITE_INFO("DHE-RSA-CAMELLIA128-SHA","TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA",CIPHER_BYTE,TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA - {"CAMELLIA256-SHA", NAME_IANA("TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"), CIPHER_BYTE, TLS_RSA_WITH_CAMELLIA_256_CBC_SHA}, + SUITE_INFO("CAMELLIA256-SHA","TLS_RSA_WITH_CAMELLIA_256_CBC_SHA",CIPHER_BYTE,TLS_RSA_WITH_CAMELLIA_256_CBC_SHA), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA - {"DHE-RSA-CAMELLIA256-SHA", NAME_IANA("TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"), CIPHER_BYTE, TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA}, + SUITE_INFO("DHE-RSA-CAMELLIA256-SHA","TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA",CIPHER_BYTE,TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA), #endif #ifdef BUILD_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256 - {"CAMELLIA128-SHA256", NAME_IANA("TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256"), CIPHER_BYTE, TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256}, + SUITE_INFO("CAMELLIA128-SHA256","TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256",CIPHER_BYTE,TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 - {"DHE-RSA-CAMELLIA128-SHA256", NAME_IANA("TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256"), CIPHER_BYTE, TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256}, + SUITE_INFO("DHE-RSA-CAMELLIA128-SHA256","TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256",CIPHER_BYTE,TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256), #endif #ifdef BUILD_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256 - {"CAMELLIA256-SHA256", NAME_IANA("TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256"), CIPHER_BYTE, TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256}, + SUITE_INFO("CAMELLIA256-SHA256","TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256",CIPHER_BYTE,TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 - {"DHE-RSA-CAMELLIA256-SHA256", NAME_IANA("TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256"), CIPHER_BYTE, TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256}, + SUITE_INFO("DHE-RSA-CAMELLIA256-SHA256","TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256",CIPHER_BYTE,TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256), #endif #ifdef BUILD_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 - {"ECDHE-RSA-AES128-SHA256", NAME_IANA("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"), ECC_BYTE, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256}, + SUITE_INFO("ECDHE-RSA-AES128-SHA256","TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",ECC_BYTE,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 - {"ECDHE-ECDSA-AES128-SHA256", NAME_IANA("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256}, + SUITE_INFO("ECDHE-ECDSA-AES128-SHA256","TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256), #endif #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256 - {"ECDH-RSA-AES128-SHA256", NAME_IANA("TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"), ECC_BYTE, TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256}, + SUITE_INFO("ECDH-RSA-AES128-SHA256","TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",ECC_BYTE,TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256), #endif #ifdef BUILD_TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256 - {"ECDH-ECDSA-AES128-SHA256", NAME_IANA("TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"), ECC_BYTE, TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256}, + SUITE_INFO("ECDH-ECDSA-AES128-SHA256","TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",ECC_BYTE,TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256), #endif #ifdef BUILD_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 - {"ECDHE-RSA-AES256-SHA384", NAME_IANA("TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"), ECC_BYTE, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384}, + SUITE_INFO("ECDHE-RSA-AES256-SHA384","TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",ECC_BYTE,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 - {"ECDHE-ECDSA-AES256-SHA384", NAME_IANA("TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384}, + SUITE_INFO("ECDHE-ECDSA-AES256-SHA384","TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384), #endif #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384 - {"ECDH-RSA-AES256-SHA384", NAME_IANA("TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"), ECC_BYTE, TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384}, + SUITE_INFO("ECDH-RSA-AES256-SHA384","TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384",ECC_BYTE,TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384), #endif #ifdef BUILD_TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384 - {"ECDH-ECDSA-AES256-SHA384", NAME_IANA("TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"), ECC_BYTE, TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384}, + SUITE_INFO("ECDH-ECDSA-AES256-SHA384","TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384",ECC_BYTE,TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384), #endif #ifdef BUILD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 - {"ECDHE-RSA-CHACHA20-POLY1305", NAME_IANA("TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"), CHACHA_BYTE, TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256}, + SUITE_INFO("ECDHE-RSA-CHACHA20-POLY1305","TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",CHACHA_BYTE,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 - {"ECDHE-ECDSA-CHACHA20-POLY1305", NAME_IANA("TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"), CHACHA_BYTE, TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256}, + SUITE_INFO("ECDHE-ECDSA-CHACHA20-POLY1305","TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",CHACHA_BYTE,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256 - {"DHE-RSA-CHACHA20-POLY1305", NAME_IANA("TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"), CHACHA_BYTE, TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256}, + SUITE_INFO("DHE-RSA-CHACHA20-POLY1305","TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256",CHACHA_BYTE,TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256), #endif #ifdef BUILD_TLS_ECDHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256 - {"ECDHE-RSA-CHACHA20-POLY1305-OLD", NAME_IANA("TLS_ECDHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256"), CHACHA_BYTE, TLS_ECDHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256}, + SUITE_INFO("ECDHE-RSA-CHACHA20-POLY1305-OLD","TLS_ECDHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256",CHACHA_BYTE,TLS_ECDHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_CHACHA20_OLD_POLY1305_SHA256 - {"ECDHE-ECDSA-CHACHA20-POLY1305-OLD", NAME_IANA("TLS_ECDHE_ECDSA_WITH_CHACHA20_OLD_POLY1305_SHA256"), CHACHA_BYTE, TLS_ECDHE_ECDSA_WITH_CHACHA20_OLD_POLY1305_SHA256}, + SUITE_INFO("ECDHE-ECDSA-CHACHA20-POLY1305-OLD","TLS_ECDHE_ECDSA_WITH_CHACHA20_OLD_POLY1305_SHA256",CHACHA_BYTE,TLS_ECDHE_ECDSA_WITH_CHACHA20_OLD_POLY1305_SHA256), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256 - {"DHE-RSA-CHACHA20-POLY1305-OLD", NAME_IANA("TLS_DHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256"), CHACHA_BYTE, TLS_DHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256}, + SUITE_INFO("DHE-RSA-CHACHA20-POLY1305-OLD","TLS_DHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256",CHACHA_BYTE,TLS_DHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256), #endif #ifdef BUILD_TLS_DH_anon_WITH_AES_128_CBC_SHA - {"ADH-AES128-SHA", NAME_IANA("TLS_DH_anon_WITH_AES_128_CBC_SHA"), CIPHER_BYTE, TLS_DH_anon_WITH_AES_128_CBC_SHA}, + SUITE_INFO("ADH-AES128-SHA","TLS_DH_anon_WITH_AES_128_CBC_SHA",CIPHER_BYTE,TLS_DH_anon_WITH_AES_128_CBC_SHA), #endif #ifdef BUILD_TLS_DH_anon_WITH_AES_256_GCM_SHA384 - {"ADH-AES256-GCM-SHA384", NAME_IANA("TLS_DH_anon_WITH_AES_256_GCM_SHA384"), CIPHER_BYTE, TLS_DH_anon_WITH_AES_256_GCM_SHA384}, + SUITE_INFO("ADH-AES256-GCM-SHA384","TLS_DH_anon_WITH_AES_256_GCM_SHA384",CIPHER_BYTE,TLS_DH_anon_WITH_AES_256_GCM_SHA384), #endif #ifdef BUILD_TLS_QSH - {"QSH", NAME_IANA("TLS_QSH"), QSH_BYTE, TLS_QSH}, + SUITE_INFO("QSH","TLS_QSH",QSH_BYTE,TLS_QSH), #endif #ifdef HAVE_RENEGOTIATION_INDICATION - {"RENEGOTIATION-INFO", NAME_IANA("TLS_EMPTY_RENEGOTIATION_INFO_SCSV"), CIPHER_BYTE, TLS_EMPTY_RENEGOTIATION_INFO_SCSV}, + SUITE_INFO("RENEGOTIATION-INFO","TLS_EMPTY_RENEGOTIATION_INFO_SCSV",CIPHER_BYTE,TLS_EMPTY_RENEGOTIATION_INFO_SCSV), #endif #ifdef BUILD_SSL_RSA_WITH_IDEA_CBC_SHA - {"IDEA-CBC-SHA", NAME_IANA("SSL_RSA_WITH_IDEA_CBC_SHA"), CIPHER_BYTE, SSL_RSA_WITH_IDEA_CBC_SHA}, + SUITE_INFO("IDEA-CBC-SHA","SSL_RSA_WITH_IDEA_CBC_SHA",CIPHER_BYTE,SSL_RSA_WITH_IDEA_CBC_SHA), #endif #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_NULL_SHA - {"ECDHE-ECDSA-NULL-SHA", NAME_IANA("TLS_ECDHE_ECDSA_WITH_NULL_SHA"), ECC_BYTE, TLS_ECDHE_ECDSA_WITH_NULL_SHA}, + SUITE_INFO("ECDHE-ECDSA-NULL-SHA","TLS_ECDHE_ECDSA_WITH_NULL_SHA",ECC_BYTE,TLS_ECDHE_ECDSA_WITH_NULL_SHA), #endif #ifdef BUILD_TLS_ECDHE_PSK_WITH_NULL_SHA256 - {"ECDHE-PSK-NULL-SHA256", NAME_IANA("TLS_ECDHE_PSK_WITH_NULL_SHA256"), ECC_BYTE, TLS_ECDHE_PSK_WITH_NULL_SHA256}, + SUITE_INFO("ECDHE-PSK-NULL-SHA256","TLS_ECDHE_PSK_WITH_NULL_SHA256",ECC_BYTE,TLS_ECDHE_PSK_WITH_NULL_SHA256), #endif #ifdef BUILD_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256 - {"ECDHE-PSK-AES128-CBC-SHA256", NAME_IANA("TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256"), ECC_BYTE, TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256}, + SUITE_INFO("ECDHE-PSK-AES128-CBC-SHA256","TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256",ECC_BYTE,TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256), #endif #ifdef BUILD_TLS_PSK_WITH_CHACHA20_POLY1305_SHA256 - {"PSK-CHACHA20-POLY1305", NAME_IANA("TLS_PSK_WITH_CHACHA20_POLY1305_SHA256"), CHACHA_BYTE, TLS_PSK_WITH_CHACHA20_POLY1305_SHA256}, + SUITE_INFO("PSK-CHACHA20-POLY1305","TLS_PSK_WITH_CHACHA20_POLY1305_SHA256",CHACHA_BYTE,TLS_PSK_WITH_CHACHA20_POLY1305_SHA256), #endif #ifdef BUILD_TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256 - {"ECDHE-PSK-CHACHA20-POLY1305", NAME_IANA("TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"), CHACHA_BYTE, TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256}, + SUITE_INFO("ECDHE-PSK-CHACHA20-POLY1305","TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256",CHACHA_BYTE,TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256), #endif #ifdef BUILD_TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256 - {"DHE-PSK-CHACHA20-POLY1305", NAME_IANA("TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256"), CHACHA_BYTE, TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256}, + SUITE_INFO("DHE-PSK-CHACHA20-POLY1305","TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256",CHACHA_BYTE,TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256), #endif #ifdef BUILD_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA - {"EDH-RSA-DES-CBC3-SHA", NAME_IANA("TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA"), CIPHER_BYTE, TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA}, + SUITE_INFO("EDH-RSA-DES-CBC3-SHA","TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA",CIPHER_BYTE,TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA), #endif #ifdef BUILD_WDM_WITH_NULL_SHA256 - {"WDM-NULL-SHA256", NAME_IANA("WDM_WITH_NULL_SHA256"), CIPHER_BYTE, WDM_WITH_NULL_SHA256}, + SUITE_INFO("WDM-NULL-SHA256","WDM_WITH_NULL_SHA256",CIPHER_BYTE,WDM_WITH_NULL_SHA256), #endif #endif /* WOLFSSL_NO_TLS12 */ #ifdef BUILD_TLS_AES_128_GCM_SHA256 - {"TLS13-AES128-GCM-SHA256", NAME_IANA("TLS_AES_128_GCM_SHA256"), TLS13_BYTE, TLS_AES_128_GCM_SHA256}, + SUITE_INFO("TLS13-AES128-GCM-SHA256","TLS_AES_128_GCM_SHA256",TLS13_BYTE,TLS_AES_128_GCM_SHA256), #endif #ifdef BUILD_TLS_AES_256_GCM_SHA384 - {"TLS13-AES256-GCM-SHA384", NAME_IANA("TLS_AES_256_GCM_SHA384"), TLS13_BYTE, TLS_AES_256_GCM_SHA384}, + SUITE_INFO("TLS13-AES256-GCM-SHA384","TLS_AES_256_GCM_SHA384",TLS13_BYTE,TLS_AES_256_GCM_SHA384), #endif #ifdef BUILD_TLS_CHACHA20_POLY1305_SHA256 - {"TLS13-CHACHA20-POLY1305-SHA256", NAME_IANA("TLS_CHACHA20_POLY1305_SHA256"), TLS13_BYTE, TLS_CHACHA20_POLY1305_SHA256}, + SUITE_INFO("TLS13-CHACHA20-POLY1305-SHA256","TLS_CHACHA20_POLY1305_SHA256",TLS13_BYTE,TLS_CHACHA20_POLY1305_SHA256), #endif #ifdef BUILD_TLS_AES_128_CCM_SHA256 - {"TLS13-AES128-CCM-SHA256", NAME_IANA("TLS_AES_128_CCM_SHA256"), TLS13_BYTE, TLS_AES_128_CCM_SHA256}, + SUITE_INFO("TLS13-AES128-CCM-SHA256","TLS_AES_128_CCM_SHA256",TLS13_BYTE,TLS_AES_128_CCM_SHA256), #endif #ifdef BUILD_TLS_AES_128_CCM_8_SHA256 - {"TLS13-AES128-CCM-8-SHA256", NAME_IANA("TLS_AES_128_CCM_8_SHA256"), TLS13_BYTE, TLS_AES_128_CCM_8_SHA256}, + SUITE_INFO("TLS13-AES128-CCM-8-SHA256","TLS_AES_128_CCM_8_SHA256",TLS13_BYTE,TLS_AES_128_CCM_8_SHA256), #endif }; -#undef NAME_IANA - /* returns the cipher_names array */ const CipherSuiteInfo* GetCipherNames(void) @@ -15952,6 +15950,7 @@ const char* GetCipherNameInternal(const byte cipherSuite0, const byte cipherSuit const char* GetCipherNameIana(const byte cipherSuite0, const byte cipherSuite) { +#ifndef NO_ERROR_STRINGS int i; const char* nameIana = "NONE"; @@ -15963,6 +15962,11 @@ const char* GetCipherNameIana(const byte cipherSuite0, const byte cipherSuite) } } return nameIana; +#else + (void)cipherSuite0; + (void)cipherSuite; + return NULL; +#endif } const char* wolfSSL_get_cipher_name_internal(WOLFSSL* ssl) diff --git a/wolfssl/internal.h b/wolfssl/internal.h index c9ef6413d..a4be73250 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -3997,7 +3997,9 @@ WOLFSSL_LOCAL word32 LowResTimer(void); typedef struct CipherSuiteInfo { const char* name; +#ifndef NO_ERROR_STRINGS const char* name_iana; +#endif byte cipherSuite0; byte cipherSuite; } CipherSuiteInfo;