diff options
| author |   Chen, Chih-Chia <pigfoot@gmail.com> | 2016-11-08 16:41:54 +0800 |
|---|---|---|
| committer | Chen, Chih-Chia <pigfoot@gmail.com> | 2016-11-08 16:41:54 +0800 |
| commit | fc02f6faa990a5cbd0f870dfde084eb215d68faf (patch) | |
| tree | 366e37a12315a3dfbb8d987b6c5895dd2e21f768 /net-analyzer | |
| parent | [sci-libs/xgboost] minor fix4 (diff) | |
| download | pigfoot-fc02f6faa990a5cbd0f870dfde084eb215d68faf.tar.gz pigfoot-fc02f6faa990a5cbd0f870dfde084eb215d68faf.tar.bz2 pigfoot-fc02f6faa990a5cbd0f870dfde084eb215d68faf.zip | |
Drop dead implementations from PYTHON_COMPAT
Diffstat (limited to 'net-analyzer')
3 files changed, 841 insertions, 1 deletions
diff --git a/net-analyzer/captipper/captipper-9999.ebuild b/net-analyzer/captipper/captipper-9999.ebuild index 37ea24b..2af8b9e 100644 --- a/net-analyzer/captipper/captipper-9999.ebuild +++ b/net-analyzer/captipper/captipper-9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{3,4,5}} ) +PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy{,3} ) EGIT_REPO_URI="https://github.com/pigfoot/CapTipper.git" EGIT_BRANCH="pf-patch" diff --git a/net-analyzer/ssldump/files/ssldump-0.9-larger-snapshot-length.patch b/net-analyzer/ssldump/files/ssldump-0.9-larger-snapshot-length.patch new file mode 100644 index 0000000..d635b5c --- /dev/null +++ b/net-analyzer/ssldump/files/ssldump-0.9-larger-snapshot-length.patch @@ -0,0 +1,11 @@ +--- a/base/pcap-snoop.c.orig ++++ b/base/pcap-snoop.c +@@ -289,7 +289,7 @@ int main(argc,argv) + err_exit("Aborting",-1); + } + } +- if(!(p=pcap_open_live(interface_name,5000,!no_promiscuous,1000,errbuf))){ ++ if(!(p=pcap_open_live(interface_name,18432,!no_promiscuous,1000,errbuf))){ + fprintf(stderr,"PCAP: %s\n",errbuf); + err_exit("Aborting",-1); + } diff --git a/net-analyzer/ssldump/files/ssldump-0.9-tls12.patch.BAK b/net-analyzer/ssldump/files/ssldump-0.9-tls12.patch.BAK new file mode 100644 index 0000000..c3eafb4 --- /dev/null +++ b/net-analyzer/ssldump/files/ssldump-0.9-tls12.patch.BAK @@ -0,0 +1,829 @@ +--- a/ssl/ssl.enums 2013-07-10 15:43:35.000000000 -0400 ++++ b/ssl/ssl.enums 2013-07-10 15:54:11.000000000 -0400 +@@ -378,6 +378,211 @@ + CipherSuite TLS_ECDH_ECDSA_WITH_DES_CBC_SHA = {0x00,0x49}; + CipherSuite TLS_ECDH_ECDSA_EXPORT_WITH_RC4_56_SHA={0xff,0x85}; + CipherSuite TLS_ECDH_ECDSA_EXPORT_WITH_RC4_40_SHA={0xff,0x84}; ++ ++ /***** Patch additions from following URL *****/ ++ /* https://www.iana.org/assignments/tls-parameters/tls-parameters.xml */ ++ /* TLS addenda using AES, per RFC 3268 */ ++ CipherSuite TLS_RSA_WITH_AES_128_CBC_SHA ={0x00,0x2f}; ++ CipherSuite TLS_DH_DSS_WITH_AES_128_CBC_SHA ={0x00,0x30}; ++ CipherSuite TLS_DH_RSA_WITH_AES_128_CBC_SHA ={0x00,0x31}; ++ CipherSuite TLS_DHE_DSS_WITH_AES_128_CBC_SHA ={0x00,0x32}; ++ CipherSuite TLS_DHE_RSA_WITH_AES_128_CBC_SHA ={0x00,0x33}; ++ CipherSuite TLS_DH_anon_WITH_AES_128_CBC_SHA ={0x00,0x34}; ++ CipherSuite TLS_RSA_WITH_AES_256_CBC_SHA ={0x00,0x35}; ++ CipherSuite TLS_DH_DSS_WITH_AES_256_CBC_SHA ={0x00,0x36}; ++ CipherSuite TLS_DH_RSA_WITH_AES_256_CBC_SHA ={0x00,0x37}; ++ CipherSuite TLS_DHE_DSS_WITH_AES_256_CBC_SHA ={0x00,0x38}; ++ CipherSuite TLS_DHE_RSA_WITH_AES_256_CBC_SHA ={0x00,0x39}; ++ CipherSuite TLS_DH_anon_WITH_AES_256_CBC_SHA ={0x00,0x3a}; ++ ++ /* ECDSA addenda, RFC 4492 */ ++ CipherSuite TLS_ECDH_ECDSA_WITH_NULL_SHA ={0xc0,0x01}; ++ CipherSuite TLS_ECDH_ECDSA_WITH_RC4_128_SHA ={0xc0,0x02}; ++ CipherSuite TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA ={0xc0,0x03}; ++ CipherSuite TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA ={0xc0,0x04}; ++ CipherSuite TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA ={0xc0,0x05}; ++ CipherSuite TLS_ECDHE_ECDSA_WITH_NULL_SHA ={0xc0,0x06}; ++ CipherSuite TLS_ECDHE_ECDSA_WITH_RC4_128_SHA ={0xc0,0x07}; ++ CipherSuite TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA ={0xc0,0x08}; ++ CipherSuite TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA ={0xc0,0x09}; ++ CipherSuite TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA ={0xc0,0x0A}; ++ CipherSuite TLS_ECDH_RSA_WITH_NULL_SHA ={0xc0,0x0B}; ++ CipherSuite TLS_ECDH_RSA_WITH_RC4_128_SHA ={0xc0,0x0C}; ++ CipherSuite TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA ={0xc0,0x0D}; ++ CipherSuite TLS_ECDH_RSA_WITH_AES_128_CBC_SHA ={0xc0,0x0E}; ++ CipherSuite TLS_ECDH_RSA_WITH_AES_256_CBC_SHA ={0xc0,0x0F}; ++ CipherSuite TLS_ECDHE_RSA_WITH_NULL_SHA ={0xc0,0x10}; ++ CipherSuite TLS_ECDHE_RSA_WITH_RC4_128_SHA ={0xc0,0x11}; ++ CipherSuite TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA ={0xc0,0x12}; ++ CipherSuite TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA ={0xc0,0x13}; ++ CipherSuite TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA ={0xc0,0x14}; ++ CipherSuite TLS_ECDH_anon_WITH_NULL_SHA ={0xc0,0x15}; ++ CipherSuite TLS_ECDH_anon_WITH_RC4_128_SHA ={0xc0,0x16}; ++ CipherSuite TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA ={0xc0,0x17}; ++ CipherSuite TLS_ECDH_anon_WITH_AES_128_CBC_SHA ={0xc0,0x18}; ++ CipherSuite TLS_ECDH_anon_WITH_AES_256_CBC_SHA ={0xc0,0x19}; ++ ++ /***** TLS 1.2 addenda, RFC 5246 *****/ ++ /* Initial state. */ ++ CipherSuite TLS_NULL_WITH_NULL_NULL ={0x00,0x00}; ++ ++ /* Server provided RSA certificate for key exchange. */ ++ CipherSuite TLS_RSA_WITH_NULL_MD5 ={0x00,0x01}; ++ CipherSuite TLS_RSA_WITH_NULL_SHA ={0x00,0x02}; ++ CipherSuite TLS_RSA_WITH_RC4_128_MD5 ={0x00,0x04}; ++ CipherSuite TLS_RSA_WITH_RC4_128_SHA ={0x00,0x05}; ++ CipherSuite TLS_RSA_WITH_3DES_EDE_CBC_SHA ={0x00,0x0A}; ++ //CipherSuite TLS_RSA_WITH_AES_128_CBC_SHA ={0x00,0x2F}; ++ //CipherSuite TLS_RSA_WITH_AES_256_CBC_SHA ={0x00,0x35}; ++ CipherSuite TLS_RSA_WITH_NULL_SHA256 ={0x00,0x3B}; ++ CipherSuite TLS_RSA_WITH_AES_128_CBC_SHA256 ={0x00,0x3C}; ++ CipherSuite TLS_RSA_WITH_AES_256_CBC_SHA256 ={0x00,0x3D}; ++ ++ /* Server-authenticated (and optionally client-authenticated) Diffie-Hellman. */ ++ CipherSuite TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA ={0x00,0x0D}; ++ CipherSuite TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA ={0x00,0x10}; ++ CipherSuite TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA ={0x00,0x13}; ++ CipherSuite TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA ={0x00,0x16}; ++ //CipherSuite TLS_DH_DSS_WITH_AES_128_CBC_SHA ={0x00,0x30}; ++ //CipherSuite TLS_DH_RSA_WITH_AES_128_CBC_SHA ={0x00,0x31}; ++ //CipherSuite TLS_DHE_DSS_WITH_AES_128_CBC_SHA ={0x00,0x32}; ++ //CipherSuite TLS_DHE_RSA_WITH_AES_128_CBC_SHA ={0x00,0x33}; ++ //CipherSuite TLS_DH_DSS_WITH_AES_256_CBC_SHA ={0x00,0x36}; ++ //CipherSuite TLS_DH_RSA_WITH_AES_256_CBC_SHA ={0x00,0x37}; ++ //CipherSuite TLS_DHE_DSS_WITH_AES_256_CBC_SHA ={0x00,0x38}; ++ //CipherSuite TLS_DHE_RSA_WITH_AES_256_CBC_SHA ={0x00,0x39}; ++ CipherSuite TLS_DH_DSS_WITH_AES_128_CBC_SHA256 ={0x00,0x3E}; ++ CipherSuite TLS_DH_RSA_WITH_AES_128_CBC_SHA256 ={0x00,0x3F}; ++ CipherSuite TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 ={0x00,0x40}; ++ CipherSuite TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 ={0x00,0x67}; ++ CipherSuite TLS_DH_DSS_WITH_AES_256_CBC_SHA256 ={0x00,0x68}; ++ CipherSuite TLS_DH_RSA_WITH_AES_256_CBC_SHA256 ={0x00,0x69}; ++ CipherSuite TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 ={0x00,0x6A}; ++ CipherSuite TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 ={0x00,0x6B}; ++ ++ /* Completely anonymous Diffie-Hellman */ ++ CipherSuite TLS_DH_anon_WITH_RC4_128_MD5 ={0x00,0x18}; ++ CipherSuite TLS_DH_anon_WITH_3DES_EDE_CBC_SHA ={0x00,0x1B}; ++ //CipherSuite TLS_DH_anon_WITH_AES_128_CBC_SHA ={0x00,0x34}; ++ //CipherSuite TLS_DH_anon_WITH_AES_256_CBC_SHA ={0x00,0x3A}; ++ CipherSuite TLS_DH_anon_WITH_AES_128_CBC_SHA256 ={0x00,0x6C}; ++ CipherSuite TLS_DH_anon_WITH_AES_256_CBC_SHA256 ={0x00,0x6D}; ++ ++ /* Addenda from rfc 5288 AES Galois Counter Mode (GCM) Cipher Suites for TLS. */ ++ CipherSuite TLS_RSA_WITH_AES_128_GCM_SHA256 ={0x00,0x9C}; ++ CipherSuite TLS_RSA_WITH_AES_256_GCM_SHA384 ={0x00,0x9D}; ++ CipherSuite TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 ={0x00,0x9E}; ++ CipherSuite TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 ={0x00,0x9F}; ++ CipherSuite TLS_DH_RSA_WITH_AES_128_GCM_SHA256 ={0x00,0xA0}; ++ CipherSuite TLS_DH_RSA_WITH_AES_256_GCM_SHA384 ={0x00,0xA1}; ++ CipherSuite TLS_DHE_DSS_WITH_AES_128_GCM_SHA256 ={0x00,0xA2}; ++ CipherSuite TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 ={0x00,0xA3}; ++ CipherSuite TLS_DH_DSS_WITH_AES_128_GCM_SHA256 ={0x00,0xA4}; ++ CipherSuite TLS_DH_DSS_WITH_AES_256_GCM_SHA384 ={0x00,0xA5}; ++ CipherSuite TLS_DH_anon_WITH_AES_128_GCM_SHA256 ={0x00,0xA6}; ++ CipherSuite TLS_DH_anon_WITH_AES_256_GCM_SHA384 ={0x00,0xA7}; ++ ++ /* Addenda from rfc 5289 Elliptic Curve Cipher Suites with HMAC SHA-256/384. */ ++ CipherSuite TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 ={0xC0,0x23}; ++ CipherSuite TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 ={0xC0,0x24}; ++ CipherSuite TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256 ={0xC0,0x25}; ++ CipherSuite TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384 ={0xC0,0x26}; ++ CipherSuite TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 ={0xC0,0x27}; ++ CipherSuite TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 ={0xC0,0x28}; ++ CipherSuite TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256 ={0xC0,0x29}; ++ CipherSuite TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384 ={0xC0,0x2A}; ++ ++ /* Addenda from rfc 5289 Elliptic Curve Cipher Suites with SHA-256/384 and AES Galois Counter Mode (GCM) */ ++ CipherSuite TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 ={0xC0,0x2B}; ++ CipherSuite TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 ={0xC0,0x2C}; ++ CipherSuite TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 ={0xC0,0x2D}; ++ CipherSuite TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 ={0xC0,0x2E}; ++ CipherSuite TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 ={0xC0,0x2F}; ++ CipherSuite TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 ={0xC0,0x30}; ++ CipherSuite TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256 ={0xC0,0x31}; ++ CipherSuite TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384 ={0xC0,0x32}; ++ ++ /* Addenda from rfc 4279 Pre-Shared Key Ciphersuites for TLS */ ++ CipherSuite TLS_PSK_WITH_RC4_128_SHA ={0x00,0x8A}; ++ CipherSuite TLS_PSK_WITH_3DES_EDE_CBC_SHA ={0x00,0x8B}; ++ CipherSuite TLS_PSK_WITH_AES_128_CBC_SHA ={0x00,0x8C}; ++ CipherSuite TLS_PSK_WITH_AES_256_CBC_SHA ={0x00,0x8D}; ++ CipherSuite TLS_DHE_PSK_WITH_RC4_128_SHA ={0x00,0x8E}; ++ CipherSuite TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA ={0x00,0x8F}; ++ CipherSuite TLS_DHE_PSK_WITH_AES_128_CBC_SHA ={0x00,0x90}; ++ CipherSuite TLS_DHE_PSK_WITH_AES_256_CBC_SHA ={0x00,0x91}; ++ CipherSuite TLS_RSA_PSK_WITH_RC4_128_SHA ={0x00,0x92}; ++ CipherSuite TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA ={0x00,0x93}; ++ CipherSuite TLS_RSA_PSK_WITH_AES_128_CBC_SHA ={0x00,0x94}; ++ CipherSuite TLS_RSA_PSK_WITH_AES_256_CBC_SHA ={0x00,0x95}; ++ ++ /* Addenda from rfc 4162 SEED Cipher Suites to TLS */ ++ CipherSuite TLS_RSA_WITH_SEED_CBC_SHA ={0x00,0x96}; ++ CipherSuite TLS_DH_DSS_WITH_SEED_CBC_SHA ={0x00,0x97}; ++ CipherSuite TLS_DH_RSA_WITH_SEED_CBC_SHA ={0x00,0x98}; ++ CipherSuite TLS_DHE_DSS_WITH_SEED_CBC_SHA ={0x00,0x99}; ++ CipherSuite TLS_DHE_RSA_WITH_SEED_CBC_SHA ={0x00,0x9A}; ++ CipherSuite TLS_DH_anon_WITH_SEED_CBC_SHA ={0x00,0x9B}; ++ ++ /* Addenda from rfc 4785 Pre-Shared Key (PSK) Ciphersuites with NULL Encryption for TLS */ ++ CipherSuite TLS_PSK_WITH_NULL_SHA ={0x00,0x2C}; ++ CipherSuite TLS_DHE_PSK_WITH_NULL_SHA ={0x00,0x2D}; ++ CipherSuite TLS_RSA_PSK_WITH_NULL_SHA ={0x00,0x2E}; ++ ++ /* Addenda from rfc 5932 Camellia Cipher Suites for TLS */ ++ CipherSuite TLS_RSA_WITH_CAMELLIA_128_CBC_SHA ={0x00,0x41}; ++ CipherSuite TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA ={0x00,0x42}; ++ CipherSuite TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA ={0x00,0x43}; ++ CipherSuite TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA ={0x00,0x44}; ++ CipherSuite TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA ={0x00,0x45}; ++ CipherSuite TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA ={0x00,0x46}; ++ ++ CipherSuite TLS_RSA_WITH_CAMELLIA_256_CBC_SHA ={0x00,0x84}; ++ CipherSuite TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA ={0x00,0x85}; ++ CipherSuite TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA ={0x00,0x86}; ++ CipherSuite TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA ={0x00,0x87}; ++ CipherSuite TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA ={0x00,0x88}; ++ CipherSuite TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA ={0x00,0x89}; ++ ++ CipherSuite TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256 ={0x00,0xBA}; ++ CipherSuite TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256 ={0x00,0xBB}; ++ CipherSuite TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256 ={0x00,0xBC}; ++ CipherSuite TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256 ={0x00,0xBD}; ++ CipherSuite TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 ={0x00,0xBE}; ++ CipherSuite TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256 ={0x00,0xBF}; ++ ++ CipherSuite TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256 ={0x00,0xC0}; ++ CipherSuite TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256 ={0x00,0xC1}; ++ CipherSuite TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256 ={0x00,0xC2}; ++ CipherSuite TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256 ={0x00,0xC3}; ++ CipherSuite TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 ={0x00,0xC4}; ++ CipherSuite TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256 ={0x00,0xC5}; ++ ++ /* ChaCha20-Poly1305 (draft in Chrome 32) */ ++ CipherSuite OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 ={0xCC,0x13} ++ CipherSuite OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 ={0xCC,0x14} ++ CipherSuite OLD_TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256 ={0xCC,0x15} ++ ++ /* Addenda from rfc 7539 ChaCha20 and Poly1305 for IETF Protocols */ ++ CipherSuite TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 ={0xCC,0xA8} ++ CipherSuite TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 ={0xCC,0xA9} ++ CipherSuite TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256 ={0xCC,0xAA} ++ CipherSuite TLS_PSK_WITH_CHACHA20_POLY1305_SHA256 ={0xCC,0xAB} ++ CipherSuite TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256 ={0xCC,0xAC} ++ CipherSuite TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256 ={0xCC,0xAD} ++ CipherSuite TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256 ={0xCC,0xAE} ++ ++ /* RFC 5746 - Secure Renegotiation */ ++ CipherSuite TLS_EMPTY_RENEGOTIATION_INFO_SCSV ={0x00,0xFF}; ++ ++ /* Tags for SSL 2 cipher kinds which are not specified for SSL 3. */ ++ CipherSuite SSL_RSA_WITH_RC2_CBC_MD5 ={0xFF,0x80}; ++ CipherSuite SSL_RSA_WITH_IDEA_CBC_MD5 ={0xFF,0x81}; ++ CipherSuite SSL_RSA_WITH_DES_CBC_MD5 ={0xFF,0x82}; ++ CipherSuite SSL_RSA_WITH_3DES_EDE_CBC_MD5 ={0xFF,0x83}; ++ CipherSuite SSL_NO_SUCH_CIPHERSUITE ={0xFF,0xFF}; ++ /***** /Patch additions *****/ ++ + } cipher_suite; + + +--- a/ssl/ssl.enums.c 2013-07-10 14:54:38.000000000 -0400 ++++ b/ssl/ssl.enums.c 2013-07-10 15:51:46.000000000 -0400 +@@ -698,6 +698,613 @@ + 65412, + "TLS_ECDH_ECDSA_EXPORT_WITH_RC4_40_SHA", + 0 }, ++ /***** Patch additions from following URL *****/ ++ /* https://www.iana.org/assignments/tls-parameters/tls-parameters.xml */ ++ { ++ 47, ++ "TLS_RSA_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 48, ++ "TLS_DH_DSS_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 49, ++ "TLS_DH_RSA_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 50, ++ "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 51, ++ "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 52, ++ "TLS_DH_anon_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 53, ++ "TLS_RSA_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 54, ++ "TLS_DH_DSS_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 55, ++ "TLS_DH_RSA_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 56, ++ "TLS_DHE_DSS_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 57, ++ "TLS_DHE_RSA_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 58, ++ "TLS_DH_anon_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 49153, ++ "TLS_ECDH_ECDSA_WITH_NULL_SHA", ++ 0 }, ++ { ++ 49154, ++ "TLS_ECDH_ECDSA_WITH_RC4_128_SHA", ++ 0 }, ++ { ++ 49155, ++ "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 49156, ++ "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 49157, ++ "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 49158, ++ "TLS_ECDHE_ECDSA_WITH_NULL_SHA", ++ 0 }, ++ { ++ 49159, ++ "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", ++ 0 }, ++ { ++ 49160, ++ "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 49161, ++ "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 49162, ++ "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 49163, ++ "TLS_ECDH_RSA_WITH_NULL_SHA", ++ 0 }, ++ { ++ 49164, ++ "TLS_ECDH_RSA_WITH_RC4_128_SHA", ++ 0 }, ++ { ++ 49165, ++ "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 49166, ++ "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 49167, ++ "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 49168, ++ "TLS_ECDHE_RSA_WITH_NULL_SHA", ++ 0 }, ++ { ++ 49169, ++ "TLS_ECDHE_RSA_WITH_RC4_128_SHA", ++ 0 }, ++ { ++ 49170, ++ "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 49171, ++ "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 49172, ++ "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 49173, ++ "TLS_ECDH_anon_WITH_NULL_SHA", ++ 0 }, ++ { ++ 49174, ++ "TLS_ECDH_anon_WITH_RC4_128_SHA", ++ 0 }, ++ { ++ 49175, ++ "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 49176, ++ "TLS_ECDH_anon_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 49177, ++ "TLS_ECDH_anon_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 0, ++ "TLS_NULL_WITH_NULL_NULL", ++ 0 }, ++ { ++ 1, ++ "TLS_RSA_WITH_NULL_MD5", ++ 0 }, ++ { ++ 2, ++ "TLS_RSA_WITH_NULL_SHA", ++ 0 }, ++ { ++ 4, ++ "TLS_RSA_WITH_RC4_128_MD5", ++ 0 }, ++ { ++ 5, ++ "TLS_RSA_WITH_RC4_128_SHA", ++ 0 }, ++ { ++ 10, ++ "TLS_RSA_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 59, ++ "TLS_RSA_WITH_NULL_SHA256", ++ 0 }, ++ { ++ 60, ++ "TLS_RSA_WITH_AES_128_CBC_SHA256", ++ 0 }, ++ { ++ 61, ++ "TLS_RSA_WITH_AES_256_CBC_SHA256", ++ 0 }, ++ { ++ 13, ++ "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 16, ++ "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 19, ++ "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 22, ++ "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 62, ++ "TLS_DH_DSS_WITH_AES_128_CBC_SHA256", ++ 0 }, ++ { ++ 63, ++ "TLS_DH_RSA_WITH_AES_128_CBC_SHA256", ++ 0 }, ++ { ++ 64, ++ "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256", ++ 0 }, ++ { ++ 103, ++ "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", ++ 0 }, ++ { ++ 104, ++ "TLS_DH_DSS_WITH_AES_256_CBC_SHA256", ++ 0 }, ++ { ++ 105, ++ "TLS_DH_RSA_WITH_AES_256_CBC_SHA256", ++ 0 }, ++ { ++ 106, ++ "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256", ++ 0 }, ++ { ++ 107, ++ "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256", ++ 0 }, ++ { ++ 24, ++ "TLS_DH_anon_WITH_RC4_128_MD5", ++ 0 }, ++ { ++ 27, ++ "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 108, ++ "TLS_DH_anon_WITH_AES_128_CBC_SHA256", ++ 0 }, ++ { ++ 109, ++ "TLS_DH_anon_WITH_AES_256_CBC_SHA256", ++ 0 }, ++ { ++ 156, ++ "TLS_RSA_WITH_AES_128_GCM_SHA256", ++ 0 }, ++ { ++ 157, ++ "TLS_RSA_WITH_AES_256_GCM_SHA384", ++ 0 }, ++ { ++ 158, ++ "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256", ++ 0 }, ++ { ++ 159, ++ "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384", ++ 0 }, ++ { ++ 160, ++ "TLS_DH_RSA_WITH_AES_128_GCM_SHA256", ++ 0 }, ++ { ++ 161, ++ "TLS_DH_RSA_WITH_AES_256_GCM_SHA384", ++ 0 }, ++ { ++ 162, ++ "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256", ++ 0 }, ++ { ++ 163, ++ "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384", ++ 0 }, ++ { ++ 164, ++ "TLS_DH_DSS_WITH_AES_128_GCM_SHA256", ++ 0 }, ++ { ++ 165, ++ "TLS_DH_DSS_WITH_AES_256_GCM_SHA384", ++ 0 }, ++ { ++ 166, ++ "TLS_DH_anon_WITH_AES_128_GCM_SHA256", ++ 0 }, ++ { ++ 167, ++ "TLS_DH_anon_WITH_AES_256_GCM_SHA384", ++ 0 }, ++ { ++ 49187, ++ "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256", ++ 0 }, ++ { ++ 49188, ++ "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384", ++ 0 }, ++ { ++ 49189, ++ "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256", ++ 0 }, ++ { ++ 49190, ++ "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384", ++ 0 }, ++ { ++ 49191, ++ "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", ++ 0 }, ++ { ++ 49192, ++ "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384", ++ 0 }, ++ { ++ 49193, ++ "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256", ++ 0 }, ++ { ++ 49194, ++ "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384", ++ 0 }, ++ { ++ 49195, ++ "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", ++ 0 }, ++ { ++ 49196, ++ "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", ++ 0 }, ++ { ++ 49197, ++ "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256", ++ 0 }, ++ { ++ 49198, ++ "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384", ++ 0 }, ++ { ++ 49199, ++ "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", ++ 0 }, ++ { ++ 49200, ++ "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", ++ 0 }, ++ { ++ 49201, ++ "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256", ++ 0 }, ++ { ++ 49202, ++ "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384", ++ 0 }, ++ { ++ 138, ++ "TLS_PSK_WITH_RC4_128_SHA", ++ 0 }, ++ { ++ 139, ++ "TLS_PSK_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 140, ++ "TLS_PSK_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 141, ++ "TLS_PSK_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 142, ++ "TLS_DHE_PSK_WITH_RC4_128_SHA", ++ 0 }, ++ { ++ 143, ++ "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 144, ++ "TLS_DHE_PSK_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 145, ++ "TLS_DHE_PSK_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 146, ++ "TLS_RSA_PSK_WITH_RC4_128_SHA", ++ 0 }, ++ { ++ 147, ++ "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA", ++ 0 }, ++ { ++ 148, ++ "TLS_RSA_PSK_WITH_AES_128_CBC_SHA", ++ 0 }, ++ { ++ 149, ++ "TLS_RSA_PSK_WITH_AES_256_CBC_SHA", ++ 0 }, ++ { ++ 150, ++ "TLS_RSA_WITH_SEED_CBC_SHA", ++ 0 }, ++ { ++ 151, ++ "TLS_DH_DSS_WITH_SEED_CBC_SHA", ++ 0 }, ++ { ++ 152, ++ "TLS_DH_RSA_WITH_SEED_CBC_SHA", ++ 0 }, ++ { ++ 153, ++ "TLS_DHE_DSS_WITH_SEED_CBC_SHA", ++ 0 }, ++ { ++ 154, ++ "TLS_DHE_RSA_WITH_SEED_CBC_SHA", ++ 0 }, ++ { ++ 155, ++ "TLS_DH_anon_WITH_SEED_CBC_SHA", ++ 0 }, ++ { ++ 44, ++ "TLS_PSK_WITH_NULL_SHA", ++ 0 }, ++ { ++ 45, ++ "TLS_DHE_PSK_WITH_NULL_SHA", ++ 0 }, ++ { ++ 46, ++ "TLS_RSA_PSK_WITH_NULL_SHA", ++ 0 }, ++ { ++ 65, ++ "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA", ++ 0 }, ++ { ++ 66, ++ "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA", ++ 0 }, ++ { ++ 67, ++ "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA", ++ 0 }, ++ { ++ 68, ++ "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA", ++ 0 }, ++ { ++ 69, ++ "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA", ++ 0 }, ++ { ++ 70, ++ "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA", ++ 0 }, ++ { ++ 132, ++ "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA", ++ 0 }, ++ { ++ 133, ++ "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA", ++ 0 }, ++ { ++ 134, ++ "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA", ++ 0 }, ++ { ++ 135, ++ "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA", ++ 0 }, ++ { ++ 136, ++ "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA", ++ 0 }, ++ { ++ 137, ++ "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA", ++ 0 }, ++ { ++ 186, ++ "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256", ++ 0 }, ++ { ++ 187, ++ "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256", ++ 0 }, ++ { ++ 188, ++ "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256", ++ 0 }, ++ { ++ 189, ++ "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256", ++ 0 }, ++ { ++ 190, ++ "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256", ++ 0 }, ++ { ++ 191, ++ "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256", ++ 0 }, ++ { ++ 192, ++ "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256", ++ 0 }, ++ { ++ 193, ++ "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256", ++ 0 }, ++ { ++ 194, ++ "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256", ++ 0 }, ++ { ++ 195, ++ "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256", ++ 0 }, ++ { ++ 196, ++ "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256", ++ 0 }, ++ { ++ 197, ++ "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256", ++ 0 }, ++ { ++ 52243, ++ "OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256", ++ 0 }, ++ { ++ 52244, ++ "OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256", ++ 0 }, ++ { ++ 52245, ++ "OLD_TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256", ++ 0 }, ++ { ++ 52392, ++ "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256", ++ 0 }, ++ { ++ 52393, ++ "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256", ++ 0 }, ++ { ++ 52394, ++ "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256", ++ 0 }, ++ { ++ 52395, ++ "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256", ++ 0 }, ++ { ++ 52396, ++ "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256", ++ 0 }, ++ { ++ 52397, ++ "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256", ++ 0 }, ++ { ++ 52398, ++ "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256", ++ 0 }, ++ { ++ 255, ++ "TLS_EMPTY_RENEGOTIATION_INFO_SCSV", ++ 0 }, ++ { ++ 65408, ++ "SSL_RSA_WITH_RC2_CBC_MD5", ++ 0 }, ++ { ++ 65409, ++ "SSL_RSA_WITH_IDEA_CBC_MD5", ++ 0 }, ++ { ++ 65410, ++ "SSL_RSA_WITH_DES_CBC_MD5", ++ 0 }, ++ { ++ 65411, ++ "SSL_RSA_WITH_3DES_EDE_CBC_MD5", ++ 0 }, ++ { ++ 65535, ++ "SSL_NO_SUCH_CIPHERSUITE", ++ 0 }, ++ /***** /Patch additions *****/ + {-1} + }; |