diff options
| -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 |