diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 00:20:58 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 00:20:58 +0000 |
| commit | 1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a (patch) | |
| tree | d804ca496db0952db185663f12193c7108854573 /net/third_party/nss/ssl/sslimpl.h | |
| parent | b518852c1a1ccf23fd3ee12d49895009cb8a5aa0 (diff) | |
| download | chromium_src-1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a.zip chromium_src-1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a.tar.gz chromium_src-1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a.tar.bz2 | |
Add a boolean |has_context| argument to the TLS ExportKeyingMaterial
method to support both nonexistent context and zero-length context.
R=agl@chromium.org,rsleevi@chromium.org
BUG=none
TEST=existing unit tests
Review URL: http://codereview.chromium.org/9663043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126799 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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/third_party/nss/ssl/sslimpl.h b/net/third_party/nss/ssl/sslimpl.h index 8f78670..e0e53e1 100644 --- a/net/third_party/nss/ssl/sslimpl.h +++ b/net/third_party/nss/ssl/sslimpl.h @@ -1715,11 +1715,11 @@ SECStatus SSL_DisableDefaultExportCipherSuites(void); SECStatus SSL_DisableExportCipherSuites(PRFileDesc * fd); PRBool SSL_IsExportCipherSuite(PRUint16 cipherSuite); -SECStatus ssl3_TLSPRFWithMasterSecret( - ssl3CipherSpec *spec, const char *label, - unsigned int labelLen, const unsigned char *val, - unsigned int valLen, unsigned char *out, - unsigned int outLen); +extern SECStatus +ssl3_TLSPRFWithMasterSecret(ssl3CipherSpec *spec, + const char *label, unsigned int labelLen, + const unsigned char *val, unsigned int valLen, + unsigned char *out, unsigned int outLen); #ifdef TRACE #define SSL_TRACE(msg) ssl_Trace msg |