Update NSS libSSL to NSS_3_15_BETA2.

net/third_party/nss/ssl/derive.c

 /*
  * Key Derivation that doesn't use PKCS11
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/* $Id: derive.c,v 1.16 2012/06/11 02:38:30 emaldona%redhat.com Exp $ */
+/* $Id$ */
 
 #include "ssl.h"        /* prereq to sslimpl.h */
 #include "certt.h"      /* prereq to sslimpl.h */
 #include "keythi.h"     /* prereq to sslimpl.h */
 #include "sslimpl.h"
 #ifndef NO_PKCS11_BYPASS
 #include "blapi.h"
 #endif
 
 #include "keyhi.h"
@@ skipping 739 matching lines @@
                 /* convert to strength in bits */
                 serverKeyStrengthInBits *= BPB;
 
                 signatureKeyStrength =
                     SSL_RSASTRENGTH_TO_ECSTRENGTH(serverKeyStrengthInBits);
 
                 if ( requiredECCbits > signatureKeyStrength ) 
                      requiredECCbits = signatureKeyStrength;
 
                 ec_curve =
-                    ssl3_GetCurveWithECKeyStrength(SSL3_SUPPORTED_CURVES_MASK,
-                                                   requiredECCbits);
+                    ssl3_GetCurveWithECKeyStrength(
+                                        ssl3_GetSupportedECCCurveMask(NULL),
+                                        requiredECCbits);
                 rv = ssl3_ECName2Params(NULL, ec_curve, &ecParams);
                 if (rv == SECFailure) {
                     break;
                 }
                 pecParams = &ecParams;
             }
 
             if (testecdhe) {
                 /* generate server's ephemeral keys */
                 keapriv = SECKEY_CreateECPrivateKey(pecParams, &keapub, NULL); 
@@ skipping 77 matching lines @@
     if (srvPubkey) {
         SECKEY_DestroyPublicKey(srvPubkey);
         srvPubkey = NULL;
     }
 
 
     return rv;
 #endif /* NO_PKCS11_BYPASS */
 }