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

Side by Side Diff: net/third_party/nss/ssl/dtlscon.c

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 4
5 /* 5 /*
6 * DTLS Protocol 6 * DTLS Protocol
7 */ 7 */
8 /* $Id: dtlscon.c,v 1.5 2012/09/28 01:46:45 wtc%google.com Exp $ */ 8 /* $Id$ */
9 9
10 #include "ssl.h" 10 #include "ssl.h"
11 #include "sslimpl.h" 11 #include "sslimpl.h"
12 #include "sslproto.h" 12 #include "sslproto.h"
13 13
14 #ifndef PR_ARRAY_SIZE 14 #ifndef PR_ARRAY_SIZE
15 #define PR_ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) 15 #define PR_ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
16 #endif 16 #endif
17 17
18 static SECStatus dtls_TransmitMessageFlight(sslSocket *ss); 18 static SECStatus dtls_TransmitMessageFlight(sslSocket *ss);
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 desired = PR_MillisecondsToInterval(ss->ssl3.hs.rtTimeoutMs); 1124 desired = PR_MillisecondsToInterval(ss->ssl3.hs.rtTimeoutMs);
1125 if (elapsed > desired) { 1125 if (elapsed > desired) {
1126 /* Timer expired */ 1126 /* Timer expired */
1127 *timeout = PR_INTERVAL_NO_WAIT; 1127 *timeout = PR_INTERVAL_NO_WAIT;
1128 } else { 1128 } else {
1129 *timeout = desired - elapsed; 1129 *timeout = desired - elapsed;
1130 } 1130 }
1131 1131
1132 return SECSuccess; 1132 return SECSuccess;
1133 } 1133 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698