Update libssl to NSS 3.18 RTM

net/third_party/nss/ssl/sslcon.c

 /* 
  * SSL v2 handshake functions, and functions common to SSL2 and SSL3.
  *
  * 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 "nssrenam.h"
 #include "cert.h"
 #include "secitem.h"
@@ skipping 410 matching lines @@
 
 /************************************************************************/
 
 /* Called from ssl2_CreateSessionCypher(), which already holds handshake lock.
  */
 static SECStatus
 ssl2_CreateMAC(sslSecurityInfo *sec, SECItem *readKey, SECItem *writeKey, 
           int cipherChoice)
 {
     switch (cipherChoice) {
-
       case SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5:
       case SSL_CK_RC2_128_CBC_WITH_MD5:
       case SSL_CK_RC4_128_EXPORT40_WITH_MD5:
       case SSL_CK_RC4_128_WITH_MD5:
       case SSL_CK_DES_64_CBC_WITH_MD5:
       case SSL_CK_DES_192_EDE3_CBC_WITH_MD5:
         sec->hash = HASH_GetHashObject(HASH_AlgMD5);
-        SECITEM_CopyItem(0, &sec->sendSecret, writeKey);
-        SECITEM_CopyItem(0, &sec->rcvSecret, readKey);
+        if (SECITEM_CopyItem(0, &sec->sendSecret, writeKey) ||
+            SECITEM_CopyItem(0, &sec->rcvSecret, readKey)) {
+            return SECFailure;
+        }
         break;
 
       default:
         PORT_SetError(SSL_ERROR_NO_CYPHER_OVERLAP);
         return SECFailure;
     }
     sec->hashcx = (*sec->hash->create)();
     if (sec->hashcx == NULL)
         return SECFailure;
     return SECSuccess;
@@ skipping 2643 matching lines @@
         ss->version       = SSL_LIBRARY_VERSION_3_0;
 
         ssl_GetSSL3HandshakeLock(ss);
         ssl_GetXmitBufLock(ss);
         rv =  ssl3_SendClientHello(ss, PR_FALSE);
         ssl_ReleaseXmitBufLock(ss);
         ssl_ReleaseSSL3HandshakeLock(ss);
 
         return rv;
     }
-#if defined(NSS_ENABLE_ECC)
+#ifndef NSS_DISABLE_ECC
     /* ensure we don't neogtiate ECC cipher suites with SSL2 hello */
     ssl3_DisableECCSuites(ss, NULL); /* disable all ECC suites */
     if (ss->cipherSpecs != NULL) {
         PORT_Free(ss->cipherSpecs);
         ss->cipherSpecs     = NULL;
         ss->sizeCipherSpecs = 0;
     }
-#endif
+#endif /* NSS_DISABLE_ECC */
 
     if (!ss->cipherSpecs) {
         rv = ssl2_ConstructCipherSpecs(ss);
         if (rv < 0) {
             return rv;
         }
     }
     localCipherSpecs = ss->cipherSpecs;
     localCipherSize  = ss->sizeCipherSpecs;
 
@@ skipping 564 matching lines @@
 
     c = __nss_ssl_rcsid[0] + __nss_ssl_sccsid[0]; 
     return NSS_VersionCheck(importedVersion);
 }
 
 const char *
 NSSSSL_GetVersion(void)
 {
     return NSS_VERSION;
 }