diff options
| author | wtc%google.com <devnull@localhost> | 2012-06-19 21:56:10 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2012-06-19 21:56:10 +0000 |
| commit | f4b03b4740d18a78efdcfd898ae534ead3a0e971 (patch) | |
| tree | 35141d995857b10223345281ef50c8b753c3ef61 /security/nss/lib/ssl | |
| parent | c24f13d94dd673a0ee302ed88bbdafc33f24e332 (diff) | |
| download | nss-hg-f4b03b4740d18a78efdcfd898ae534ead3a0e971.tar.gz | |
Bug 681065: Rename DTLS_GetTimeout to DTLS_GetHandshakeTimeout. r=ekr.
Modified Files:
dtlscon.c ssl.def ssl.h
Diffstat (limited to 'security/nss/lib/ssl')
| -rw-r--r-- | security/nss/lib/ssl/dtlscon.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/ssl/ssl.def | 2 | ||||
| -rw-r--r-- | security/nss/lib/ssl/ssl.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/lib/ssl/dtlscon.c b/security/nss/lib/ssl/dtlscon.c index d2eea63f3..790598f51 100644 --- a/security/nss/lib/ssl/dtlscon.c +++ b/security/nss/lib/ssl/dtlscon.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/security/nss/lib/ssl/ssl.def b/security/nss/lib/ssl/ssl.def index 717aaf090..ee5b03e8a 100644 --- a/security/nss/lib/ssl/ssl.def +++ b/security/nss/lib/ssl/ssl.def @@ -143,7 +143,7 @@ SSL_AuthCertificateComplete; ;+}; ;+NSS_3.14 { # NSS 3.14 release ;+ global: -DTLS_GetTimeout; +DTLS_GetHandshakeTimeout; DTLS_ImportFD; SSL_ExportKeyingMaterial; SSL_VersionRangeGet; diff --git a/security/nss/lib/ssl/ssl.h b/security/nss/lib/ssl/ssl.h index 8e247b566..5640de242 100644 --- a/security/nss/lib/ssl/ssl.h +++ b/security/nss/lib/ssl/ssl.h @@ -853,8 +853,8 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, ** 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 |