Bug 540304: Rename ExtensionType to SSLExtensionType. The patch is
authorwtc%google.com
Thu, 04 Feb 2010 03:21:11 +0000
changeset 9536 b4a9e127e39294461d50c2268405e075096ea4af
parent 9535 038d3ae4f3f2b76cf42075b5e5c0c3a695576169
child 9537 c4539761e1a94b860be2c760d399018c86391c96
push idunknown
push userunknown
push dateunknown
bugs540304
Bug 540304: Rename ExtensionType to SSLExtensionType. The patch is contributed by Kai Engert <kaie@kuix.de>. r=wtc. Modified Files: ssl.h sslreveal.c sslt.h
security/nss/lib/ssl/ssl.h
security/nss/lib/ssl/sslreveal.c
security/nss/lib/ssl/sslt.h
--- a/security/nss/lib/ssl/ssl.h
+++ b/security/nss/lib/ssl/ssl.h
@@ -603,14 +603,14 @@ SSL_IMPORT SECStatus SSL_CanBypass(CERTC
 				   PRUint16 *ciphers, int nciphers,
                                    PRBool *pcanbypass, void *pwArg);
 
 /*
 ** Did the handshake with the peer negotiate the given extension?
 ** Output parameter valid only if function returns SECSuccess
 */
 SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc * socket,
-                                                      ExtensionType extId,
+                                                      SSLExtensionType extId,
                                                       PRBool *yes);
 
 SEC_END_PROTOS
 
 #endif /* __ssl_h_ */
--- a/security/nss/lib/ssl/sslreveal.c
+++ b/security/nss/lib/ssl/sslreveal.c
@@ -100,17 +100,17 @@ SSL_RevealURL(PRFileDesc * fd)
 
 
 /* given PRFileDesc, returns status information related to extensions 
  * negotiated with peer during the handshake.
  */
 
 SECStatus
 SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, 
-                                 ExtensionType extId,
+                                 SSLExtensionType extId,
                                  PRBool *pYes)
 {
   /* some decisions derived from SSL_GetChannelInfo */
   sslSocket * sslsocket = NULL;
   SECStatus rv = SECFailure;
 
   if (!pYes)
     return rv;
--- a/security/nss/lib/ssl/sslt.h
+++ b/security/nss/lib/ssl/sslt.h
@@ -199,13 +199,13 @@ typedef enum {
 typedef enum {
     ssl_server_name_xtn              = 0,
 #ifdef NSS_ENABLE_ECC
     ssl_elliptic_curves_xtn          = 10,
     ssl_ec_point_formats_xtn         = 11,
 #endif
     ssl_session_ticket_xtn           = 35,
     ssl_renegotiation_info_xtn       = 0xff01	/* experimental number */
-} ExtensionType;
+} SSLExtensionType;
 
 #define SSL_MAX_EXTENSIONS             5
 
 #endif /* __sslt_h_ */