diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 16:23:29 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 16:23:29 +0000 |
| commit | 1ec0c3dfe8f52f5846adb87a9fadcb1f95754221 (patch) | |
| tree | ef37b7e223b2bd792ba9377a57d82c5740b99565 /net/third_party/nss | |
| parent | c885046e2c6c813f934661b9e924cf6ab79291e6 (diff) | |
| download | chromium_src-1ec0c3dfe8f52f5846adb87a9fadcb1f95754221.zip chromium_src-1ec0c3dfe8f52f5846adb87a9fadcb1f95754221.tar.gz chromium_src-1ec0c3dfe8f52f5846adb87a9fadcb1f95754221.tar.bz2 | |
Rename DTLS_GetTimeout to DTLS_GetHandshakeTimeout
This was renamed upstream as part of
https://bugzilla.mozilla.org/show_bug.cgi?id=681065#c37 for NSS 3.14
Update the local NSS patch to reflect this naming so that code built
against the DTLS functionality can be tested with upstream trunk or
with Chromium NSS-SSL.
BUG=none
TEST=it compiles
R=agl@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10693078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss')
| -rw-r--r-- | net/third_party/nss/patches/dtls.patch | 6 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/dtls1con.c | 2 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/ssl.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/third_party/nss/patches/dtls.patch b/net/third_party/nss/patches/dtls.patch index 724230c..f8239d2 100644 --- a/net/third_party/nss/patches/dtls.patch +++ b/net/third_party/nss/patches/dtls.patch @@ -37,8 +37,8 @@ Index: net/third_party/nss/ssl/ssl.h +** the DTLS handshake? Returns SECFailure if not DTLS or not in a +** handshake. +*/ -+SSL_IMPORT SECStatus DTLS_GetTimeout(PRFileDesc *socket, -+ PRIntervalTime *timeout); ++SSL_IMPORT SECStatus DTLS_GetHandshakeTimeout(PRFileDesc *socket, ++ PRIntervalTime *timeout); + +/* * Return a boolean that indicates whether the underlying library @@ -3252,7 +3252,7 @@ Index: net/third_party/nss/ssl/dtls1con.c +} + +SECStatus -+DTLS_GetTimeout(PRFileDesc *socket, PRIntervalTime *timeout) ++DTLS_GetHandshakeTimeout(PRFileDesc *socket, PRIntervalTime *timeout) +{ + sslSocket * ss = NULL; + PRIntervalTime elapsed; diff --git a/net/third_party/nss/ssl/dtls1con.c b/net/third_party/nss/ssl/dtls1con.c index 3c7bf37..a020416 100644 --- a/net/third_party/nss/ssl/dtls1con.c +++ b/net/third_party/nss/ssl/dtls1con.c @@ -1134,7 +1134,7 @@ dtls_RecordSetRecvd(DTLSRecvdRecords *records, PRUint64 seq) } SECStatus -DTLS_GetTimeout(PRFileDesc *socket, PRIntervalTime *timeout) +DTLS_GetHandshakeTimeout(PRFileDesc *socket, PRIntervalTime *timeout) { sslSocket * ss = NULL; PRIntervalTime elapsed; diff --git a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h index 518cb21..ceca7dd 100644 --- a/net/third_party/nss/ssl/ssl.h +++ b/net/third_party/nss/ssl/ssl.h @@ -1021,8 +1021,8 @@ SSL_IMPORT SECStatus SSL_SetClientChannelIDCallback( ** the DTLS handshake? Returns SECFailure if not DTLS or not in a ** handshake. */ -SSL_IMPORT SECStatus DTLS_GetTimeout(PRFileDesc *socket, - PRIntervalTime *timeout); +SSL_IMPORT SECStatus DTLS_GetHandshakeTimeout(PRFileDesc *socket, + PRIntervalTime *timeout); /* * Return a boolean that indicates whether the underlying library |