From 01d72d81f7e86f9433a81792cd61038506fe0048 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 20 Dec 2014 09:04:54 +0100 Subject: curl: sync with 7.29.0-19 from RHEL-7 (for EL-5) --- 0005-curl-7.27.0-f208bf5a.patch | 190 ---------------------------------------- 1 file changed, 190 deletions(-) delete mode 100644 0005-curl-7.27.0-f208bf5a.patch (limited to '0005-curl-7.27.0-f208bf5a.patch') diff --git a/0005-curl-7.27.0-f208bf5a.patch b/0005-curl-7.27.0-f208bf5a.patch deleted file mode 100644 index c164fd0..0000000 --- a/0005-curl-7.27.0-f208bf5a.patch +++ /dev/null @@ -1,190 +0,0 @@ -From c78462408b8033c99cb45e70f34586ceb8fa8276 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Thu, 9 Aug 2012 14:08:11 +0200 -Subject: [PATCH] docs: update the links to cipher-suites supported by NSS - -... and make the list of cipher-suites in nss.c readable by humans. - -Bug: http://curl.haxx.se/mail/archive-2012-08/0016.html - -[upstream commit f208bf5a2d622ae525690dfba2ab58abd8d72264] ---- - docs/curl.1 | 2 +- - docs/libcurl/curl_easy_setopt.3 | 2 +- - lib/nss.c | 105 +++++++++++++++++++-------------------- - 3 files changed, 53 insertions(+), 56 deletions(-) - -diff --git a/docs/curl.1 b/docs/curl.1 -index 0e29ed5..5ba3d56 100644 ---- a/docs/curl.1 -+++ b/docs/curl.1 -@@ -223,7 +223,7 @@ must specify valid ciphers. Read up on SSL cipher list details on this URL: - - NSS ciphers are done differently than OpenSSL and GnuTLS. The full list of - NSS ciphers is in the NSSCipherSuite entry at this URL: --\fIhttp://directory.fedora.redhat.com/docs/mod_nss.html#Directives\fP -+\fIhttp://git.fedorahosted.org/cgit/mod_nss.git/plain/docs/mod_nss.html#Directives\fP - - If this option is used several times, the last one will override the others. - .IP "--compressed" -diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 -index 25a7d5e..d83afe8 100644 ---- a/docs/libcurl/curl_easy_setopt.3 -+++ b/docs/libcurl/curl_easy_setopt.3 -@@ -2367,7 +2367,7 @@ this option then all known ciphers are disabled and only those passed in - are enabled. - - You'll find more details about the NSS cipher lists on this URL: --\fIhttp://directory.fedora.redhat.com/docs/mod_nss.html#Directives\fP -+\fIhttp://git.fedorahosted.org/cgit/mod_nss.git/plain/docs/mod_nss.html#Directives\fP - - .IP CURLOPT_SSL_SESSIONID_CACHE - Pass a long set to 0 to disable libcurl's use of SSL session-ID caching. Set -diff --git a/lib/nss.c b/lib/nss.c -index fef7c3d..705a625 100644 ---- a/lib/nss.c -+++ b/lib/nss.c -@@ -89,7 +89,6 @@ volatile int initialized = 0; - typedef struct { - const char *name; - int num; -- PRInt32 version; /* protocol version valid for this cipher */ - } cipher_s; - - #define PK11_SETATTRS(_attr, _idx, _type, _val, _len) do { \ -@@ -101,65 +100,63 @@ typedef struct { - - #define CERT_NewTempCertificate __CERT_NewTempCertificate - --enum sslversion { SSL2 = 1, SSL3 = 2, TLS = 4 }; -- - #define NUM_OF_CIPHERS sizeof(cipherlist)/sizeof(cipherlist[0]) - static const cipher_s cipherlist[] = { - /* SSL2 cipher suites */ -- {"rc4", SSL_EN_RC4_128_WITH_MD5, SSL2}, -- {"rc4-md5", SSL_EN_RC4_128_WITH_MD5, SSL2}, -- {"rc4export", SSL_EN_RC4_128_EXPORT40_WITH_MD5, SSL2}, -- {"rc2", SSL_EN_RC2_128_CBC_WITH_MD5, SSL2}, -- {"rc2export", SSL_EN_RC2_128_CBC_EXPORT40_WITH_MD5, SSL2}, -- {"des", SSL_EN_DES_64_CBC_WITH_MD5, SSL2}, -- {"desede3", SSL_EN_DES_192_EDE3_CBC_WITH_MD5, SSL2}, -+ {"rc4", SSL_EN_RC4_128_WITH_MD5}, -+ {"rc4-md5", SSL_EN_RC4_128_WITH_MD5}, -+ {"rc4export", SSL_EN_RC4_128_EXPORT40_WITH_MD5}, -+ {"rc2", SSL_EN_RC2_128_CBC_WITH_MD5}, -+ {"rc2export", SSL_EN_RC2_128_CBC_EXPORT40_WITH_MD5}, -+ {"des", SSL_EN_DES_64_CBC_WITH_MD5}, -+ {"desede3", SSL_EN_DES_192_EDE3_CBC_WITH_MD5}, - /* SSL3/TLS cipher suites */ -- {"rsa_rc4_128_md5", SSL_RSA_WITH_RC4_128_MD5, SSL3 | TLS}, -- {"rsa_rc4_128_sha", SSL_RSA_WITH_RC4_128_SHA, SSL3 | TLS}, -- {"rsa_3des_sha", SSL_RSA_WITH_3DES_EDE_CBC_SHA, SSL3 | TLS}, -- {"rsa_des_sha", SSL_RSA_WITH_DES_CBC_SHA, SSL3 | TLS}, -- {"rsa_rc4_40_md5", SSL_RSA_EXPORT_WITH_RC4_40_MD5, SSL3 | TLS}, -- {"rsa_rc2_40_md5", SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5, SSL3 | TLS}, -- {"rsa_null_md5", SSL_RSA_WITH_NULL_MD5, SSL3 | TLS}, -- {"rsa_null_sha", SSL_RSA_WITH_NULL_SHA, SSL3 | TLS}, -- {"fips_3des_sha", SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA, SSL3 | TLS}, -- {"fips_des_sha", SSL_RSA_FIPS_WITH_DES_CBC_SHA, SSL3 | TLS}, -- {"fortezza", SSL_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA, SSL3 | TLS}, -- {"fortezza_rc4_128_sha", SSL_FORTEZZA_DMS_WITH_RC4_128_SHA, SSL3 | TLS}, -- {"fortezza_null", SSL_FORTEZZA_DMS_WITH_NULL_SHA, SSL3 | TLS}, -+ {"rsa_rc4_128_md5", SSL_RSA_WITH_RC4_128_MD5}, -+ {"rsa_rc4_128_sha", SSL_RSA_WITH_RC4_128_SHA}, -+ {"rsa_3des_sha", SSL_RSA_WITH_3DES_EDE_CBC_SHA}, -+ {"rsa_des_sha", SSL_RSA_WITH_DES_CBC_SHA}, -+ {"rsa_rc4_40_md5", SSL_RSA_EXPORT_WITH_RC4_40_MD5}, -+ {"rsa_rc2_40_md5", SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5}, -+ {"rsa_null_md5", SSL_RSA_WITH_NULL_MD5}, -+ {"rsa_null_sha", SSL_RSA_WITH_NULL_SHA}, -+ {"fips_3des_sha", SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA}, -+ {"fips_des_sha", SSL_RSA_FIPS_WITH_DES_CBC_SHA}, -+ {"fortezza", SSL_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA}, -+ {"fortezza_rc4_128_sha", SSL_FORTEZZA_DMS_WITH_RC4_128_SHA}, -+ {"fortezza_null", SSL_FORTEZZA_DMS_WITH_NULL_SHA}, - /* TLS 1.0: Exportable 56-bit Cipher Suites. */ -- {"rsa_des_56_sha", TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA, SSL3 | TLS}, -- {"rsa_rc4_56_sha", TLS_RSA_EXPORT1024_WITH_RC4_56_SHA, SSL3 | TLS}, -+ {"rsa_des_56_sha", TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA}, -+ {"rsa_rc4_56_sha", TLS_RSA_EXPORT1024_WITH_RC4_56_SHA}, - /* AES ciphers. */ -- {"rsa_aes_128_sha", TLS_RSA_WITH_AES_128_CBC_SHA, SSL3 | TLS}, -- {"rsa_aes_256_sha", TLS_RSA_WITH_AES_256_CBC_SHA, SSL3 | TLS}, -+ {"rsa_aes_128_sha", TLS_RSA_WITH_AES_128_CBC_SHA}, -+ {"rsa_aes_256_sha", TLS_RSA_WITH_AES_256_CBC_SHA}, - #ifdef NSS_ENABLE_ECC - /* ECC ciphers. */ -- {"ecdh_ecdsa_null_sha", TLS_ECDH_ECDSA_WITH_NULL_SHA, TLS}, -- {"ecdh_ecdsa_rc4_128_sha", TLS_ECDH_ECDSA_WITH_RC4_128_SHA, TLS}, -- {"ecdh_ecdsa_3des_sha", TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA, TLS}, -- {"ecdh_ecdsa_aes_128_sha", TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA, TLS}, -- {"ecdh_ecdsa_aes_256_sha", TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA, TLS}, -- {"ecdhe_ecdsa_null_sha", TLS_ECDHE_ECDSA_WITH_NULL_SHA, TLS}, -- {"ecdhe_ecdsa_rc4_128_sha", TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, TLS}, -- {"ecdhe_ecdsa_3des_sha", TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, TLS}, -- {"ecdhe_ecdsa_aes_128_sha", TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS}, -- {"ecdhe_ecdsa_aes_256_sha", TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS}, -- {"ecdh_rsa_null_sha", TLS_ECDH_RSA_WITH_NULL_SHA, TLS}, -- {"ecdh_rsa_128_sha", TLS_ECDH_RSA_WITH_RC4_128_SHA, TLS}, -- {"ecdh_rsa_3des_sha", TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, TLS}, -- {"ecdh_rsa_aes_128_sha", TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, TLS}, -- {"ecdh_rsa_aes_256_sha", TLS_ECDH_RSA_WITH_AES_256_CBC_SHA, TLS}, -- {"echde_rsa_null", TLS_ECDHE_RSA_WITH_NULL_SHA, TLS}, -- {"ecdhe_rsa_rc4_128_sha", TLS_ECDHE_RSA_WITH_RC4_128_SHA, TLS}, -- {"ecdhe_rsa_3des_sha", TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, TLS}, -- {"ecdhe_rsa_aes_128_sha", TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS}, -- {"ecdhe_rsa_aes_256_sha", TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS}, -- {"ecdh_anon_null_sha", TLS_ECDH_anon_WITH_NULL_SHA, TLS}, -- {"ecdh_anon_rc4_128sha", TLS_ECDH_anon_WITH_RC4_128_SHA, TLS}, -- {"ecdh_anon_3des_sha", TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA, TLS}, -- {"ecdh_anon_aes_128_sha", TLS_ECDH_anon_WITH_AES_128_CBC_SHA, TLS}, -- {"ecdh_anon_aes_256_sha", TLS_ECDH_anon_WITH_AES_256_CBC_SHA, TLS}, -+ {"ecdh_ecdsa_null_sha", TLS_ECDH_ECDSA_WITH_NULL_SHA}, -+ {"ecdh_ecdsa_rc4_128_sha", TLS_ECDH_ECDSA_WITH_RC4_128_SHA}, -+ {"ecdh_ecdsa_3des_sha", TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA}, -+ {"ecdh_ecdsa_aes_128_sha", TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA}, -+ {"ecdh_ecdsa_aes_256_sha", TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA}, -+ {"ecdhe_ecdsa_null_sha", TLS_ECDHE_ECDSA_WITH_NULL_SHA}, -+ {"ecdhe_ecdsa_rc4_128_sha", TLS_ECDHE_ECDSA_WITH_RC4_128_SHA}, -+ {"ecdhe_ecdsa_3des_sha", TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA}, -+ {"ecdhe_ecdsa_aes_128_sha", TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA}, -+ {"ecdhe_ecdsa_aes_256_sha", TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA}, -+ {"ecdh_rsa_null_sha", TLS_ECDH_RSA_WITH_NULL_SHA}, -+ {"ecdh_rsa_128_sha", TLS_ECDH_RSA_WITH_RC4_128_SHA}, -+ {"ecdh_rsa_3des_sha", TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA}, -+ {"ecdh_rsa_aes_128_sha", TLS_ECDH_RSA_WITH_AES_128_CBC_SHA}, -+ {"ecdh_rsa_aes_256_sha", TLS_ECDH_RSA_WITH_AES_256_CBC_SHA}, -+ {"echde_rsa_null", TLS_ECDHE_RSA_WITH_NULL_SHA}, -+ {"ecdhe_rsa_rc4_128_sha", TLS_ECDHE_RSA_WITH_RC4_128_SHA}, -+ {"ecdhe_rsa_3des_sha", TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA}, -+ {"ecdhe_rsa_aes_128_sha", TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA}, -+ {"ecdhe_rsa_aes_256_sha", TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA}, -+ {"ecdh_anon_null_sha", TLS_ECDH_anon_WITH_NULL_SHA}, -+ {"ecdh_anon_rc4_128sha", TLS_ECDH_anon_WITH_RC4_128_SHA}, -+ {"ecdh_anon_3des_sha", TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA}, -+ {"ecdh_anon_aes_128_sha", TLS_ECDH_anon_WITH_AES_128_CBC_SHA}, -+ {"ecdh_anon_aes_256_sha", TLS_ECDH_anon_WITH_AES_256_CBC_SHA}, - #endif - }; - -@@ -248,7 +245,7 @@ static SECStatus set_ciphers(struct SessionHandle *data, PRFileDesc * model, - for(i=0; i