Index: net/third_party/nss/ssl/sslimpl.h |
=================================================================== |
--- net/third_party/nss/ssl/sslimpl.h (revision 86360) |
+++ net/third_party/nss/ssl/sslimpl.h (working copy) |
@@ -351,6 +351,7 @@ |
unsigned int enableFalseStart : 1; /* 23 */ |
unsigned int enableSnapStart : 1; /* 24 */ |
unsigned int enableOCSPStapling : 1; /* 25 */ |
+ unsigned int enableCachedInfo : 1; /* 26 */ |
} sslOptions; |
typedef enum { sslHandshakingUndetermined = 0, |
@@ -777,6 +778,11 @@ |
}; |
typedef enum { |
+ cached_info_certificate_chain = 1, |
+ cached_info_trusted_cas = 2 |
+} TLSCachedInfoType; |
+ |
+typedef enum { |
snap_start_none = 0, |
snap_start_full, |
snap_start_recovery, |
@@ -1612,6 +1618,8 @@ |
PRUint16 ex_type, SECItem *data); |
extern SECStatus ssl3_ClientHandleNextProtoNegoXtn(sslSocket *ss, |
PRUint16 ex_type, SECItem *data); |
+extern SECStatus ssl3_ClientHandleCachedInfoXtn(sslSocket *ss, |
+ PRUint16 ex_type, SECItem *data); |
extern SECStatus ssl3_ClientHandleStatusRequestXtn(sslSocket *ss, |
PRUint16 ex_type, SECItem *data); |
extern SECStatus ssl3_ServerHandleSessionTicketXtn(sslSocket *ss, |
@@ -1633,6 +1641,8 @@ |
*/ |
extern PRInt32 ssl3_SendServerNameXtn(sslSocket *ss, PRBool append, |
PRUint32 maxBytes); |
+extern PRInt32 ssl3_ClientSendCachedInfoXtn(sslSocket *ss, PRBool append, |
+ PRUint32 maxBytes); |
extern PRInt32 ssl3_SendSnapStartXtn(sslSocket *ss, PRBool append, |
PRUint32 maxBytes); |
extern SECStatus ssl3_ClientHandleSnapStartXtn(sslSocket *ss, PRUint16 ex_type, |