summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Thomson <martin.thomson@gmail.com>2017-11-09 10:40:46 +1100
committerMartin Thomson <martin.thomson@gmail.com>2017-11-09 10:40:46 +1100
commite564eace017322e976569978618a7c415b2001e5 (patch)
tree97e400215bd56cd32544df0861998d0f3cbacbe4
parent5b7052f25b3f4570a31b83e76f301fd2f5893a80 (diff)
downloadnss-hg-e564eace017322e976569978618a7c415b2001e5.tar.gz
Bug 1415718 - Initialize version in ssl3_SendClientHello, r=ttaubert
-rw-r--r--lib/ssl/ssl3con.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c
index f6faf702d..71d886c24 100644
--- a/lib/ssl/ssl3con.c
+++ b/lib/ssl/ssl3con.c
@@ -4954,7 +4954,7 @@ ssl3_SendClientHello(sslSocket *ss, sslClientHelloType type)
PRBool requestingResume = PR_FALSE, fallbackSCSV = PR_FALSE;
PRInt32 total_exten_len = 0;
unsigned numCompressionMethods;
- PRUint16 version;
+ PRUint16 version = ss->vrange.max;
PRInt32 flags;
SSL_TRC(3, ("%d: SSL3[%d]: send %s ClientHello handshake", SSL_GETPID(),
@@ -5102,8 +5102,6 @@ ssl3_SendClientHello(sslSocket *ss, sslClientHelloType type)
if (sid->version < ss->vrange.min ||
sid->version > ss->vrange.max) {
sidOK = PR_FALSE;
- } else {
- version = ss->vrange.max;
}
}
}
@@ -5137,8 +5135,6 @@ ssl3_SendClientHello(sslSocket *ss, sslClientHelloType type)
*/
if (ss->firstHsDone) {
version = ss->clientHelloVersion;
- } else {
- version = ss->vrange.max;
}
sid = ssl3_NewSessionID(ss, PR_FALSE);