diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2017-11-07 12:00:24 +1100 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2017-11-07 12:00:24 +1100 |
| commit | 758e148ea8362cd30e62c68ad29b9d97fc38706c (patch) | |
| tree | 387f3aeedabca284078e455a15da1459c1c351f2 | |
| parent | 1b5a66233b70154ad5b3737193598ab8362dbedf (diff) | |
| download | nss-hg-758e148ea8362cd30e62c68ad29b9d97fc38706c.tar.gz | |
Bug 1411475 - Fixup merge trash, r=ekrNSS_3_34_BETA3
| -rw-r--r-- | lib/ssl/ssl3con.c | 3 | ||||
| -rw-r--r-- | lib/ssl/tls13con.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c index 05752716b..a2e3b40ef 100644 --- a/lib/ssl/ssl3con.c +++ b/lib/ssl/ssl3con.c @@ -6840,8 +6840,9 @@ ssl3_HandleServerHello(sslSocket *ss, PRUint8 *b, PRUint32 length) rv = ssl_ClientSetCipherSuite(ss, ss->version, cipher, PR_TRUE /* init hashes */); if (rv != SECSuccess) { + desc = handshake_failure; errCode = PORT_GetError(); - goto loser; + goto alert_loser; } rv = ssl3_HandleParsedExtensions(ss, server_hello); diff --git a/lib/ssl/tls13con.c b/lib/ssl/tls13con.c index 301f2ecd1..eb3ed8f96 100644 --- a/lib/ssl/tls13con.c +++ b/lib/ssl/tls13con.c @@ -2744,9 +2744,6 @@ tls13_SetupPendingCipherSpec(sslSocket *ss, ssl3CipherSpec *spec) PORT_Assert(ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss)); - ssl_GetSpecWriteLock(ss); /*******************************/ - - spec = ss->ssl3.pwSpec; /* Version isn't set when we send 0-RTT data. */ spec->version = PR_MAX(SSL_LIBRARY_VERSION_TLS_1_3, ss->version); |