summaryrefslogtreecommitdiff
path: root/lib/ssl
diff options
context:
space:
mode:
authorJ.C. Jones <jjones@mozilla.com>2019-08-14 14:23:15 +0000
committerJ.C. Jones <jjones@mozilla.com>2019-08-14 14:23:15 +0000
commit5a7d8fb173c0b99f5adb0807ae634cb37f6e6f76 (patch)
tree4041ce4d8d69e41d5ae79d8a570061fdb92de8de /lib/ssl
parent14c197ed16fb5a50906b0fbf38d49b7c5c166ba5 (diff)
downloadnss-hg-5a7d8fb173c0b99f5adb0807ae634cb37f6e6f76.tar.gz
Bug 1572593 - Reset advertised extensions in ssl_ConstructExtensions r=mt,kjacobs
Reset the list of advertised extensions before sending a new set. This reverts the changes of https://hg.mozilla.org/projects/nss/rev/1ca362213631d6edc885b6b965b52ecffcf29afd Differential Revision: https://phabricator.services.mozilla.com/D41302
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/ssl3ext.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/ssl3ext.c b/lib/ssl/ssl3ext.c
index 032795bc4..7e674f0e0 100644
--- a/lib/ssl/ssl3ext.c
+++ b/lib/ssl/ssl3ext.c
@@ -714,6 +714,9 @@ ssl_ConstructExtensions(sslSocket *ss, sslBuffer *buf, SSLHandshakeType message)
PORT_Assert(buf->len == 0);
+ /* Clear out any extensions previously advertised */
+ ss->xtnData.numAdvertised = 0;
+
switch (message) {
case ssl_hs_client_hello:
if (ss->vrange.max > SSL_LIBRARY_VERSION_3_0) {