Update NSS to 3.48 while keeping vc2013 hackfix and no-sslkeylogfile intact.

This commit is contained in:
Roy Tam 2020-01-03 13:36:26 +08:00
commit 171849c8e5
351 changed files with 115185 additions and 57946 deletions

View file

@ -580,9 +580,9 @@ tls13_ClientSetupESNI(sslSocket *ss)
size_t i;
PRCList *cur;
SECStatus rv;
TLS13KeyShareEntry *share;
TLS13KeyShareEntry *share = NULL;
const sslNamedGroupDef *group = NULL;
PRTime now = PR_Now() / PR_USEC_PER_SEC;
PRTime now = ssl_Time(ss) / PR_USEC_PER_SEC;
PORT_Assert(!ss->xtnData.esniPrivateKey);
@ -728,7 +728,7 @@ tls13_ServerDecryptEsniXtn(const sslSocket *ss, const PRUint8 *in, unsigned int
{
sslReader rdr = SSL_READER(in, inLen);
PRUint64 suite;
const ssl3CipherSuiteDef *suiteDef;
const ssl3CipherSuiteDef *suiteDef = NULL;
SSLAEADCipher aead = NULL;
TLSExtension *keyShareExtension;
TLS13KeyShareEntry *entry = NULL;