From: msweet Date: Tue, 19 May 2015 15:03:48 +0000 (+0000) Subject: Add more cipher suites. X-Git-Tag: v2.2b1~300 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88da3fd755332b52ad20d5846f128682dfd2b223;p=thirdparty%2Fcups.git Add more cipher suites. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12640 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/cups/tlscheck.c b/cups/tlscheck.c index f75c7cfd28..3f495dbb85 100644 --- a/cups/tlscheck.c +++ b/cups/tlscheck.c @@ -415,6 +415,152 @@ main(int argc, /* I - Number of command-line arguments */ cipherName = "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"; paramsNeeded = 1; break; + case TLS_RSA_WITH_AES_128_CBC_SHA: + cipherName = "TLS_RSA_WITH_AES_128_CBC_SHA"; + break; + case TLS_DH_DSS_WITH_AES_128_CBC_SHA: + cipherName = "TLS_DH_DSS_WITH_AES_128_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_DH_RSA_WITH_AES_128_CBC_SHA: + cipherName = "TLS_DH_RSA_WITH_AES_128_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_DHE_DSS_WITH_AES_128_CBC_SHA: + cipherName = "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_DHE_RSA_WITH_AES_128_CBC_SHA: + cipherName = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_DH_anon_WITH_AES_128_CBC_SHA: + cipherName = "TLS_DH_anon_WITH_AES_128_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_RSA_WITH_AES_256_CBC_SHA: + cipherName = "TLS_RSA_WITH_AES_256_CBC_SHA"; + break; + case TLS_DH_DSS_WITH_AES_256_CBC_SHA: + cipherName = "TLS_DH_DSS_WITH_AES_256_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_DH_RSA_WITH_AES_256_CBC_SHA: + cipherName = "TLS_DH_RSA_WITH_AES_256_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_DHE_DSS_WITH_AES_256_CBC_SHA: + cipherName = "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_DHE_RSA_WITH_AES_256_CBC_SHA: + cipherName = "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_DH_anon_WITH_AES_256_CBC_SHA: + cipherName = "TLS_DH_anon_WITH_AES_256_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_ECDSA_WITH_NULL_SHA: + cipherName = "TLS_ECDH_ECDSA_WITH_NULL_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_ECDSA_WITH_RC4_128_SHA: + cipherName = "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA: + cipherName = "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA: + cipherName = "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA: + cipherName = "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDHE_ECDSA_WITH_NULL_SHA: + cipherName = "TLS_ECDHE_ECDSA_WITH_NULL_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDHE_ECDSA_WITH_RC4_128_SHA: + cipherName = "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA: + cipherName = "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA: + cipherName = "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA: + cipherName = "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_RSA_WITH_NULL_SHA: + cipherName = "TLS_ECDH_RSA_WITH_NULL_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_RSA_WITH_RC4_128_SHA: + cipherName = "TLS_ECDH_RSA_WITH_RC4_128_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA: + cipherName = "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA: + cipherName = "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA: + cipherName = "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDHE_RSA_WITH_NULL_SHA: + cipherName = "TLS_ECDHE_RSA_WITH_NULL_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDHE_RSA_WITH_RC4_128_SHA: + cipherName = "TLS_ECDHE_RSA_WITH_RC4_128_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA: + cipherName = "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA: + cipherName = "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA: + cipherName = "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_anon_WITH_NULL_SHA: + cipherName = "TLS_ECDH_anon_WITH_NULL_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_anon_WITH_RC4_128_SHA: + cipherName = "TLS_ECDH_anon_WITH_RC4_128_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA: + cipherName = "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_anon_WITH_AES_128_CBC_SHA: + cipherName = "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"; + paramsNeeded = 1; + break; + case TLS_ECDH_anon_WITH_AES_256_CBC_SHA: + cipherName = "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"; + paramsNeeded = 1; + break; default : snprintf(unknownCipherName, sizeof(unknownCipherName), "UNKNOWN_%04X", cipher); cipherName = unknownCipherName;