Bug 681065: Rename DTLS_GetTimeout to DTLS_GetHandshakeTimeout. r=ekr.
authorwtc%google.com
Tue, 19 Jun 2012 21:56:10 +0000
changeset 10389 d3cc1398045304080eadfa3d2c77a53cf8048877
parent 10388 552faea2250f1b0e827cedf0c6625103fc5b8b21
child 10390 0ad1a9e101fde20cfe089f8781e2c87b2148bcf1
push idunknown
push userunknown
push dateunknown
reviewersekr
bugs681065
Bug 681065: Rename DTLS_GetTimeout to DTLS_GetHandshakeTimeout. r=ekr. Modified Files: dtlscon.c ssl.def ssl.h
security/nss/lib/ssl/dtlscon.c
security/nss/lib/ssl/ssl.def
security/nss/lib/ssl/ssl.h
--- a/security/nss/lib/ssl/dtlscon.c
+++ b/security/nss/lib/ssl/dtlscon.c
@@ -1129,17 +1129,17 @@ dtls_RecordSetRecvd(DTLSRecvdRecords *re
     }
 
     offset = seq % DTLS_RECVD_RECORDS_WINDOW;
 
     records->data[offset / 8] |= (1 << (offset % 8));
 }
 
 SECStatus
-DTLS_GetTimeout(PRFileDesc *socket, PRIntervalTime *timeout)
+DTLS_GetHandshakeTimeout(PRFileDesc *socket, PRIntervalTime *timeout)
 {
     sslSocket * ss = NULL;
     PRIntervalTime elapsed;
     PRIntervalTime desired;
 
     ss = ssl_FindSocket(socket);
 
     if (!ss)
--- a/security/nss/lib/ssl/ssl.def
+++ b/security/nss/lib/ssl/ssl.def
@@ -138,17 +138,17 @@ SSL_SetNextProtoCallback;
 SSL_SetNextProtoNego;
 SSL_GetNextProto;
 SSL_AuthCertificateComplete;
 ;+    local:
 ;+       *;
 ;+};
 ;+NSS_3.14 {      # NSS 3.14 release
 ;+    global:
-DTLS_GetTimeout;
+DTLS_GetHandshakeTimeout;
 DTLS_ImportFD;
 SSL_ExportKeyingMaterial;
 SSL_VersionRangeGet;
 SSL_VersionRangeGetDefault;
 SSL_VersionRangeGetSupported;
 SSL_VersionRangeSet;
 SSL_VersionRangeSetDefault;
 ;+    local:
--- a/security/nss/lib/ssl/ssl.h
+++ b/security/nss/lib/ssl/ssl.h
@@ -848,18 +848,18 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti
                                                       SSLExtensionType extId,
                                                       PRBool *yes);
 
 /*
 ** How long should we wait before retransmitting the next flight of
 ** 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
  * will perform as the caller expects.
  *
  * The only argument is a string, which should be the version
  * identifier of the NSS library. That string will be compared
  * against a string that represents the actual build version of