Commit 665c160f authored by Kamil Dudka's avatar Kamil Dudka
Browse files

nss: do not use the NSS_ENABLE_ECC define 

It is not provided by NSS public headers.

Bug: https://bugzilla.redhat.com/1058776
parent e15e73b7

RELEASE-NOTES

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ This release includes the following changes: 


This release includes the following bugfixes:



 o nss: allow to use ECC ciphers if NSS implements them [1]

 o 



This release includes the following known bugs:
@@ -28,4 +29,4 @@ advice from friends like these: 


References to bug reports and discussions on issues:



 [1] = 
 [1] = https://bugzilla.redhat.com/1058776

lib/vtls/nss.c

+0 −2
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ static const cipher_s cipherlist[] = { 
  /* AES ciphers. */

  {"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},

  {"ecdh_ecdsa_rc4_128_sha",     TLS_ECDH_ECDSA_WITH_RC4_128_SHA},
@@ -152,7 +151,6 @@ static const cipher_s cipherlist[] = { 
  {"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

};



/* following ciphers are new in NSS 3.4 and not enabled by default, therefore