net/third_party/nss/patches/deprioritizedhe.patch - Issue 3118002: List TLS_DHE_RSA_WITH_AES_256_CBC_SHA after...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: net/third_party/nss/patches/deprioritizedhe.patch

Issue 3118002: List TLS_DHE_RSA_WITH_AES_256_CBC_SHA after... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Add Chromium issue number. Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
(Empty)
	1 diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c

	2 --- a/security/nss/lib/ssl/ssl3con.c

	3 +++ b/security/nss/lib/ssl/ssl3con.c

	4 @@ -106,24 +106,24 @@ static SECStatus Null_Cipher(void *ctx,

	5 static ssl3CipherSuiteCfg cipherSuites[ssl_V3_SUITES_IMPLEMENTED] = {

	6 /* cipher_suite policy enabled is_present* /

	7 #ifdef NSS_ENABLE_ECC

	8 { TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	9 { TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	10 #endif /* NSS_ENABLE_ECC */

	11 { TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	12 { TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	13 - { TLS_DHE_RSA_WITH_AES_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	14 { TLS_DHE_DSS_WITH_AES_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	15 #ifdef NSS_ENABLE_ECC

	16 { TLS_ECDH_RSA_WITH_AES_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	17 { TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	18 #endif /* NSS_ENABLE_ECC */

	19 { TLS_RSA_WITH_CAMELLIA_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_ FALSE},

	20 { TLS_RSA_WITH_AES_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	21 + { TLS_DHE_RSA_WITH_AES_256_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	22

	23 #ifdef NSS_ENABLE_ECC

	24 { TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	25 { TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	26 { TLS_ECDHE_RSA_WITH_RC4_128_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	27 { TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	28 #endif /* NSS_ENABLE_ECC */

	29 { TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},

	30 diff --git a/security/nss/lib/ssl/sslenum.c b/security/nss/lib/ssl/sslenum.c

	31 --- a/security/nss/lib/ssl/sslenum.c

	32 +++ b/security/nss/lib/ssl/sslenum.c

	33 @@ -61,24 +61,24 @@

	34 const PRUint16 SSL_ImplementedCiphers[] = {

	35 /* 256-bit */

	36 #ifdef NSS_ENABLE_ECC

	37 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,

	38 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,

	39 #endif /* NSS_ENABLE_ECC */

	40 TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,

	41 TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,

	42 - TLS_DHE_RSA_WITH_AES_256_CBC_SHA,

	43 TLS_DHE_DSS_WITH_AES_256_CBC_SHA,

	44 #ifdef NSS_ENABLE_ECC

	45 TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,

	46 TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,

	47 #endif /* NSS_ENABLE_ECC */

	48 TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,

	49 TLS_RSA_WITH_AES_256_CBC_SHA,

	50 + TLS_DHE_RSA_WITH_AES_256_CBC_SHA,

	51

	52 /* 128-bit */

	53 #ifdef NSS_ENABLE_ECC

	54 TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,

	55 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,

	56 TLS_ECDHE_RSA_WITH_RC4_128_SHA,

	57 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,

	58 #endif /* NSS_ENABLE_ECC */

OLD	NEW

« no previous file with comments | « net/third_party/nss/README.chromium ('k') | net/third_party/nss/ssl/ssl3con.c » ('j') | no next file with comments »