diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 16:04:20 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 16:04:20 +0000 |
| commit | deffb93ae82baf9125ab1129a64ad087f602ee6b (patch) | |
| tree | 11bd5e7229dfa4eaeacda28cd18d099f97c75769 /net/third_party/nss/ssl/ssl.h | |
| parent | 33ca366d226f980c5a8513f09258ca84addc8f47 (diff) | |
| download | chromium_src-deffb93ae82baf9125ab1129a64ad087f602ee6b.zip chromium_src-deffb93ae82baf9125ab1129a64ad087f602ee6b.tar.gz chromium_src-deffb93ae82baf9125ab1129a64ad087f602ee6b.tar.bz2 | |
net: allow SSL secrets to be exported sooner.
This also addresses some follows up from previous CLs.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7493056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/ssl/ssl.h')
| -rw-r--r-- | net/third_party/nss/ssl/ssl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h index 1537aae..6b364bb 100644 --- a/net/third_party/nss/ssl/ssl.h +++ b/net/third_party/nss/ssl/ssl.h @@ -688,14 +688,16 @@ SSL_IMPORT SECItem *SSL_GetNegotiatedHostInfo(PRFileDesc *fd); /* Export keying material according to RFC 5705. ** fd must correspond to a TLS 1.0 or higher socket and out must -** already be allocated. +** already be allocated. If contextLen is zero it uses the no-context +** construction from the RFC. */ SSL_IMPORT SECStatus SSL_ExportKeyingMaterial(PRFileDesc *fd, const char *label, + unsigned int labelLen, const unsigned char *context, - unsigned int contextlen, + unsigned int contextLen, unsigned char *out, - unsigned int outlen); + unsigned int outLen); /* ** Return a new reference to the certificate that was most recently sent |