diff options
| author | Elio Maldonado <emaldona@redhat.com> | 2016-05-01 09:01:38 -0700 |
|---|---|---|
| committer | Elio Maldonado <emaldona@redhat.com> | 2016-05-01 09:01:38 -0700 |
| commit | 54745dcf19f0b794aebebae21f92409e6800ed25 (patch) | |
| tree | 932e29a142a7d1d80a3044915b84871bbce3eb1a | |
| parent | e5a08c5e3e9b91b5c1121b78ea416b623b08abbb (diff) | |
| download | nss-hg-54745dcf19f0b794aebebae21f92409e6800ed25.tar.gz | |
Remove duplicate enttries
| -rw-r--r-- | lib/ssl/ssl3con.c | 2 | ||||
| -rw-r--r-- | lib/ssl/sslinfo.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c index 5e710bb66..f41ca35a2 100644 --- a/lib/ssl/ssl3con.c +++ b/lib/ssl/ssl3con.c @@ -3902,7 +3902,7 @@ ssl3_GetPrfHashMechanism(sslSocket *ss) case ssl_hash_sha256: case ssl_hash_none: /* ssl_hash_none is for pre-1.2 suites, which use SHA-256. */ - return CKM_SHA256; + return CKM_SHA256; default: PORT_Assert(0); } diff --git a/lib/ssl/sslinfo.c b/lib/ssl/sslinfo.c index fd2702863..b58c4c60f 100644 --- a/lib/ssl/sslinfo.c +++ b/lib/ssl/sslinfo.c @@ -295,9 +295,6 @@ static const SSLCipherSuiteInfo suiteInfo[] = { { 0, CS(DHE_DSS_WITH_AES_256_GCM_SHA384), S_DSA, K_DHE, C_AESGCM, B_256, M_AEAD_128, F_FIPS_STD, A_DSA }, { 0, CS(DHE_RSA_WITH_AES_256_GCM_SHA384), S_RSA, K_DHE, C_AESGCM, B_256, M_AEAD_128, F_FIPS_STD, A_RSAS }, - { 0, CS(DHE_DSS_WITH_AES_128_GCM_SHA256), S_DSA, K_DHE, C_AESGCM, B_128, M_AEAD_128, F_FIPS_STD, A_DSA }, - { 0, CS(DHE_DSS_WITH_AES_128_CBC_SHA256), S_DSA, K_DHE, C_AES, B_128, M_SHA256, F_FIPS_STD, A_DSA }, - { 0, CS(DHE_DSS_WITH_AES_256_CBC_SHA256), S_DSA, K_DHE, C_AES, B_256, M_SHA256, F_FIPS_STD, A_DSA }, { 0, CS(RSA_WITH_AES_256_GCM_SHA384), S_RSA, K_RSA, C_AESGCM, B_256, M_AEAD_128, F_FIPS_STD, A_RSAD } }; |