Update net/third_party/nss to NSS 3.15.4.

net/third_party/nss/ssl/ssl3ecc.c

 /*
  * SSL3 Protocol
  *
  * 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/. */
 
 /* ECC code moved here from ssl3con.c */
 
 #include "nss.h"
@@ skipping 20 matching lines @@
 #include <stdio.h>
 
 /* This is a bodge to allow this code to be compiled against older NSS headers
  * that don't contain the TLS 1.2 changes. */
 #ifndef CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256
 #define CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256 (CKM_NSS + 24)
 #endif
 
 #ifdef NSS_ENABLE_ECC
 
-/*
- * In NSS 3.13.2 the definition of the EC_POINT_FORM_UNCOMPRESSED macro
- * was moved from the internal header ec.h to the public header blapit.h.
- * Define the macro here when compiling against older system NSS headers.
- */
-#ifndef EC_POINT_FORM_UNCOMPRESSED
-#define EC_POINT_FORM_UNCOMPRESSED 0x04
-#endif
-
 #ifndef PK11_SETATTRS
 #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \
                 (x)->pValue=(v); (x)->ulValueLen = (l);
 #endif
 
 #define SSL_GET_SERVER_PUBLIC_KEY(sock, type) \
     (ss->serverCerts[type].serverKeyPair ? \
     ss->serverCerts[type].serverKeyPair->pubKey : NULL)
 
 #define SSL_IS_CURVE_NEGOTIATED(curvemsk, curveName) \
@@ skipping 1215 matching lines @@
     ssl3_DisableECCSuites(ss, ecdhe_ecdsa_suites);
     return SECFailure;
 
 loser:
     /* no common curve supported */
     ssl3_DisableECCSuites(ss, ecSuites);
     return SECFailure;
 }
 
 #endif /* NSS_ENABLE_ECC */