summaryrefslogtreecommitdiffstats
path: root/net/third_party
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 05:46:52 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 05:46:52 +0000
commit05ee36910ac5577373e247012e006603e9768cd1 (patch)
tree2153ec32b4e36ab4352654f49276b3f948ab8421 /net/third_party
parent6060b10c0db5aab66ed98323a79b239a2df0119b (diff)
downloadchromium_src-05ee36910ac5577373e247012e006603e9768cd1.zip
chromium_src-05ee36910ac5577373e247012e006603e9768cd1.tar.gz
chromium_src-05ee36910ac5577373e247012e006603e9768cd1.tar.bz2
Set ss->ssl3.hs.recvMessageSeq to 0 in dtls_RehandshakeCleanup.
R=rsleevi@chromium.org BUG=120938 TEST=none Review URL: http://codereview.chromium.org/9958008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
-rw-r--r--net/third_party/nss/patches/dtls.patch3
-rw-r--r--net/third_party/nss/ssl/dtls1con.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/net/third_party/nss/patches/dtls.patch b/net/third_party/nss/patches/dtls.patch
index 1dc2325..724230c 100644
--- a/net/third_party/nss/patches/dtls.patch
+++ b/net/third_party/nss/patches/dtls.patch
@@ -2115,7 +2115,7 @@ Index: net/third_party/nss/ssl/dtls1con.c
===================================================================
--- net/third_party/nss/ssl/dtls1con.c (revision 0)
+++ net/third_party/nss/ssl/dtls1con.c (revision 0)
-@@ -0,0 +1,1163 @@
+@@ -0,0 +1,1164 @@
+/*
+ * DTLS Protocol
+ *
@@ -3058,6 +3058,7 @@ Index: net/third_party/nss/ssl/dtls1con.c
+ dtls_CancelTimer(ss);
+ ssl3_DestroyCipherSpec(ss->ssl3.pwSpec, PR_FALSE);
+ ss->ssl3.hs.sendMessageSeq = 0;
++ ss->ssl3.hs.recvMessageSeq = 0;
+}
+
+/* Set the MTU to the next step less than or equal to the
diff --git a/net/third_party/nss/ssl/dtls1con.c b/net/third_party/nss/ssl/dtls1con.c
index 5843651..3c7bf37 100644
--- a/net/third_party/nss/ssl/dtls1con.c
+++ b/net/third_party/nss/ssl/dtls1con.c
@@ -940,6 +940,7 @@ dtls_RehandshakeCleanup(sslSocket *ss)
dtls_CancelTimer(ss);
ssl3_DestroyCipherSpec(ss->ssl3.pwSpec, PR_FALSE);
ss->ssl3.hs.sendMessageSeq = 0;
+ ss->ssl3.hs.recvMessageSeq = 0;
}
/* Set the MTU to the next step less than or equal to the