Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1925)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/third_party/nss/ssl/sslcon.c

Issue 9764001: Add DTLS support to NSS, contributed by Eric Rescorla. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Made a second pass, reviewed dtls1con.c only for coding style Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/third_party/nss/ssl/ssl3gthr.c ('K') | « net/third_party/nss/ssl/ssl3prot.h ('k') | net/third_party/nss/ssl/ssldef.c » ('j') | net/third_party/nss/ssl/sslgathr.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/ssl/sslcon.c
===================================================================
--- net/third_party/nss/ssl/sslcon.c (revision 127709)
+++ net/third_party/nss/ssl/sslcon.c (working copy)
@@ -1249,7 +1249,12 @@
ssl_GetRecvBufLock(ss);
- if (ss->version >= SSL_LIBRARY_VERSION_3_0) {
+ /* The special case DTLS logic is needed here because the SSL/TLS
+ * version wants to auto-detect SSL2 vs. SSL3 on the initial handshake
+ * (ss->version == 0) but with DTLS it gets confused, so we force the
+ * SSL3 version.
+ */
+ if ((ss->version >= SSL_LIBRARY_VERSION_3_0) || IS_DTLS(ss)) {
wtc 2012/03/22 01:11:42 rsleevi: see my comment at ssl3con.c:6495 about th
/* Wait for handshake to complete, or application data to arrive. */
rv = ssl3_GatherCompleteHandshake(ss, 0);
} else {
@@ -3120,7 +3125,7 @@
ssl_GetSSL3HandshakeLock(ss);
ssl_GetXmitBufLock(ss);
- rv = ssl3_SendClientHello(ss);
+ rv = ssl3_SendClientHello(ss, PR_FALSE);
ssl_ReleaseXmitBufLock(ss);
ssl_ReleaseSSL3HandshakeLock(ss);
« net/third_party/nss/ssl/ssl3gthr.c ('K') | « net/third_party/nss/ssl/ssl3prot.h ('k') | net/third_party/nss/ssl/ssldef.c » ('j') | net/third_party/nss/ssl/sslgathr.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698