Update libssl to NSS 3.18 RTM

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/. */
 
 #include "ssl.h"        /* prereq to sslimpl.h */
 #include "certt.h"      /* prereq to sslimpl.h */
 #include "keythi.h"     /* prereq to sslimpl.h */
@@ skipping 599 matching lines @@
     SECItem           param;
     CK_VERSION        version;
     CK_MECHANISM_TYPE mechanism_array[2];
     SECItem           enc_pms = {siBuffer, NULL, 0};
     PRBool            isTLS = PR_FALSE;
     SSLCipherSuiteInfo csdef;
     PRBool            testrsa = PR_FALSE;
     PRBool            testrsa_export = PR_FALSE;
     PRBool            testecdh = PR_FALSE;
     PRBool            testecdhe = PR_FALSE;
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
     SECKEYECParams ecParams = { siBuffer, NULL, 0 };
 #endif
 
     if (!cert || !srvPrivkey || !ciphersuites || !pcanbypass) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
     
     srvPubkey = CERT_ExtractPublicKey(cert);
     if (!srvPubkey)
         return SECFailure;
         
     *pcanbypass = PR_TRUE;
     rv = SECFailure;
     
     /* determine which KEAs to test */
-    /* 0 (SSL_NULL_WITH_NULL_NULL) is used as a list terminator because
+    /* 0 (TLS_NULL_WITH_NULL_NULL) is used as a list terminator because
      * SSL3 and TLS specs forbid negotiating that cipher suite number.
      */
     for (i=0; i < nsuites && (suite = *ciphersuites++) != 0; i++) {
         /* skip SSL2 cipher suites and ones NSS doesn't support */
         if (SSL_GetCipherSuiteInfo(suite, &csdef, sizeof(csdef)) != SECSuccess
             || SSL_IS_SSL2_CIPHER(suite) )
             continue;
         switch (csdef.keaType) {
         case ssl_kea_rsa:
             switch (csdef.cipherSuite) {
             case TLS_RSA_EXPORT1024_WITH_RC4_56_SHA:
             case TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA:
-            case SSL_RSA_EXPORT_WITH_RC4_40_MD5:
-            case SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5:
+            case TLS_RSA_EXPORT_WITH_RC4_40_MD5:
+            case TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5:
                 testrsa_export = PR_TRUE;
             }
             if (!testrsa_export)
                 testrsa = PR_TRUE;
             break;
         case ssl_kea_ecdh:
             if (strcmp(csdef.keaTypeName, "ECDHE") == 0) /* ephemeral? */
                 testecdhe = PR_TRUE;
             else
                 testecdh = PR_TRUE;
@@ skipping 86 matching lines @@
                 goto done;
             break;
         }
 
         /* Check for NULL to avoid double free. 
          * SECItem_FreeItem sets data NULL in secitem.c#265 
          */
         if (enc_pms.data != NULL) {
             SECITEM_FreeItem(&enc_pms, PR_FALSE);
         }
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
         for (; (privKeytype == ecKey && ( testecdh || testecdhe)) ||
                (privKeytype == rsaKey && testecdhe); ) {
             CK_MECHANISM_TYPE target;
             SECKEYPublicKey  *keapub = NULL;
             SECKEYPrivateKey *keapriv;
             SECKEYPublicKey  *cpub = NULL; /* client's ephemeral ECDH keys */
             SECKEYPrivateKey *cpriv = NULL;
             SECKEYECParams   *pecParams = NULL;
 
             if (privKeytype == ecKey && testecdhe) {
@@ skipping 83 matching lines @@
             }
             if (rv == SECSuccess && *pcanbypass == PR_FALSE)
                 goto done;
             break;
         }
         /* Check for NULL to avoid double free. */
         if (ecParams.data != NULL) {
             PORT_Free(ecParams.data);
             ecParams.data = NULL;
         }
-#endif /* NSS_ENABLE_ECC */
+#endif /* NSS_DISABLE_ECC */
         if (pms)
             PK11_FreeSymKey(pms);
     }
 
     /* *pcanbypass has been set */
     rv = SECSuccess;
     
   done:
     if (pms)
         PK11_FreeSymKey(pms);
 
     /* Check for NULL to avoid double free. 
      * SECItem_FreeItem sets data NULL in secitem.c#265 
      */
     if (enc_pms.data != NULL) {
         SECITEM_FreeItem(&enc_pms, PR_FALSE);
     }
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
     if (ecParams.data != NULL) {
         PORT_Free(ecParams.data);
         ecParams.data = NULL;
     }
-#endif /* NSS_ENABLE_ECC */
+#endif /* NSS_DISABLE_ECC */
 
     if (srvPubkey) {
         SECKEY_DestroyPublicKey(srvPubkey);
         srvPubkey = NULL;
     }
 
 
     return rv;
 #endif /* NO_PKCS11_BYPASS */
 }