Index: net/third_party/nss/ssl/sslimpl.h |
=================================================================== |
--- net/third_party/nss/ssl/sslimpl.h (revision 89911) |
+++ net/third_party/nss/ssl/sslimpl.h (working copy) |
@@ -349,6 +349,7 @@ |
unsigned int requireSafeNegotiation : 1; /* 22 */ |
unsigned int enableFalseStart : 1; /* 23 */ |
unsigned int enableOCSPStapling : 1; /* 24 */ |
+ unsigned int enableCachedInfo : 1; /* 25 */ |
} sslOptions; |
typedef enum { sslHandshakingUndetermined = 0, |
@@ -773,6 +774,11 @@ |
PRUint32 sniNameArrSize; |
}; |
+typedef enum { |
+ cached_info_certificate_chain = 1, |
+ cached_info_trusted_cas = 2 |
+} TLSCachedInfoType; |
+ |
/* |
** This is the "hs" member of the "ssl3" struct. |
** This entire struct is protected by ssl3HandshakeLock |
@@ -854,6 +860,14 @@ |
CERTCertificateList *clientCertChain; /* used by client */ |
PRBool sendEmptyCert; /* used by client */ |
+ /* TLS Cached Info Extension */ |
+ CERTCertificate ** predictedCertChain; |
+ /* An array terminated with a NULL. */ |
+ PRUint8 certChainDigest[8]; |
+ /* Used in cached info extension. Stored in network |
+ * byte order. */ |
+ PRBool digestReceived; |
+ |
int policy; |
/* This says what cipher suites we can do, and should |
* be either SSL_ALLOWED or SSL_RESTRICTED |
@@ -1550,6 +1564,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, |
@@ -1571,6 +1587,8 @@ |
*/ |
extern PRInt32 ssl3_SendServerNameXtn(sslSocket *ss, PRBool append, |
PRUint32 maxBytes); |
+extern PRInt32 ssl3_ClientSendCachedInfoXtn(sslSocket *ss, PRBool append, |
+ PRUint32 maxBytes); |
/* Assigns new cert, cert chain and keys to ss->serverCerts |
* struct. If certChain is NULL, tries to find one. Aborts if |