Index: net/third_party/nss/ssl/sslimpl.h |
=================================================================== |
--- net/third_party/nss/ssl/sslimpl.h (revision 222795) |
+++ net/third_party/nss/ssl/sslimpl.h (working copy) |
@@ -905,6 +905,8 @@ |
PRUint32 rtTimeoutMs; /* The length of the current timeout |
* used for backoff (in ms) */ |
PRUint32 rtRetries; /* The retry counter */ |
+ PRBool canFalseStart; /* Can/did we False Start */ |
wtc
2013/09/18 22:57:23
I moved this new member elsewhere because this sec
|
+ |
} SSL3HandshakeState; |
@@ -1160,6 +1162,10 @@ |
unsigned long clientAuthRequested; |
unsigned long delayDisabled; /* Nagle delay disabled */ |
unsigned long firstHsDone; /* first handshake is complete. */ |
+ unsigned long enoughFirstHsDone; /* enough of the handshake is done |
+ * for callbacks to be able to |
+ * retrieve channel security |
+ * parameters from callback functions. */ |
unsigned long handshakeBegun; |
unsigned long lastWriteBlocked; |
unsigned long recvdCloseNotify; /* received SSL EOF. */ |
@@ -1208,6 +1214,8 @@ |
void *badCertArg; |
SSLHandshakeCallback handshakeCallback; |
void *handshakeCallbackData; |
+ SSLCanFalseStartCallback canFalseStartCallback; |
+ void *canFalseStartCallbackData; |
void *pkcs11PinArg; |
SSLNextProtoCallback nextProtoCallback; |
void *nextProtoArg; |
@@ -1421,7 +1429,6 @@ |
extern SECStatus ssl_EnableNagleDelay(sslSocket *ss, PRBool enabled); |
-extern PRBool ssl3_CanFalseStart(sslSocket *ss); |
extern SECStatus |
ssl3_CompressMACEncryptRecord(ssl3CipherSpec * cwSpec, |
PRBool isServer, |