diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 15:32:28 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 15:32:28 +0000 |
| commit | c500bc9f09f9b28c9dbc2c956abdbb8e7f5e6600 (patch) | |
| tree | c66897fd54bc3031c05a39f93d5e4d9486ace92d /net/third_party/nss/ssl/sslimpl.h | |
| parent | ac9f9790f66dfc60f0759c8d44989aa6ebb3852f (diff) | |
| download | chromium_src-c500bc9f09f9b28c9dbc2c956abdbb8e7f5e6600.zip chromium_src-c500bc9f09f9b28c9dbc2c956abdbb8e7f5e6600.tar.gz chromium_src-c500bc9f09f9b28c9dbc2c956abdbb8e7f5e6600.tar.bz2 | |
Reshuffle some NSS code to make way for Snap Start.
TEST=net_unittests
BUG=none
http://codereview.chromium.org/3074008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/ssl/sslimpl.h')
| -rw-r--r-- | net/third_party/nss/ssl/sslimpl.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/net/third_party/nss/ssl/sslimpl.h b/net/third_party/nss/ssl/sslimpl.h index fe7ac7a..5fe45d2 100644 --- a/net/third_party/nss/ssl/sslimpl.h +++ b/net/third_party/nss/ssl/sslimpl.h @@ -278,6 +278,7 @@ struct sslSocketOpsStr { /* Flags interpreted by ssl send functions. */ #define ssl_SEND_FLAG_FORCE_INTO_BUFFER 0x40000000 #define ssl_SEND_FLAG_NO_BUFFER 0x20000000 +#define ssl_SEND_FLAG_NO_FLUSH 0x10000000 #define ssl_SEND_FLAG_MASK 0x7f000000 /* @@ -743,7 +744,8 @@ struct TLSExtensionDataStr { /* SessionTicket Extension related data. */ PRBool ticketTimestampVerified; - PRBool emptySessionTicket; + PRBool serverReceivedEmptySessionTicket; + PRBool clientSentNonEmptySessionTicket; /* SNI Extension related data * Names data is not coppied from the input buffer. It can not be @@ -1503,6 +1505,29 @@ extern SECStatus ssl3_VerifySignedHashes(SSL3Hashes *hash, extern SECStatus ssl3_CacheWrappedMasterSecret(sslSocket *ss, sslSessionID *sid, ssl3CipherSpec *spec, SSL3KEAType effectiveExchKeyType); +extern const ssl3CipherSuiteDef* ssl_LookupCipherSuiteDef(ssl3CipherSuite suite); +extern SECStatus ssl3_SetupPendingCipherSpec(sslSocket *ss); +extern SECStatus ssl3_SendClientKeyExchange(sslSocket *ss); +extern SECStatus ssl3_SendFinished(sslSocket *ss, PRInt32 flags); +extern SECStatus ssl3_CompressMACEncryptRecord + (sslSocket * ss, + SSL3ContentType type, + const SSL3Opaque * pIn, + PRUint32 contentLen); +extern PRBool ssl3_ClientExtensionAdvertised(sslSocket *ss, PRUint16 ex_type); +extern SECStatus ssl3_SetupMasterSecretFromSessionID(sslSocket* ss); +extern SECStatus ssl3_ComputeHandshakeHashes( + sslSocket * ss, + ssl3CipherSpec *spec, /* uses ->master_secret */ + SSL3Hashes * hashes, /* output goes here. */ + PRUint32 sender); +extern SECStatus ssl3_UpdateHandshakeHashes(sslSocket* ss, unsigned char *b, + unsigned int l); +extern SECStatus ssl3_ComputeTLSFinished( + ssl3CipherSpec *spec, + PRBool isServer, + const SSL3Finished * hashes, + TLSFinished * tlsFinished); /* Functions that handle ClientHello and ServerHello extensions. */ extern SECStatus ssl3_HandleServerNameXtn(sslSocket * ss, |