diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 14:22:04 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 14:22:04 +0000 |
| commit | f97ed250a7e8b55c23fa5483526d0ce06725b055 (patch) | |
| tree | 5e2ad81259eda18f325ef5fc9ff78943e43ed3fb /net/third_party/nss/ssl/sslplatf.c | |
| parent | 1b66763c1b983ad8d26f34d385924afbbe2c8104 (diff) | |
| download | chromium_src-f97ed250a7e8b55c23fa5483526d0ce06725b055.zip chromium_src-f97ed250a7e8b55c23fa5483526d0ce06725b055.tar.gz chromium_src-f97ed250a7e8b55c23fa5483526d0ce06725b055.tar.bz2 | |
Update NSS libSSL to NSS_3_15_BETA2.
The OCSP stapling patch has been accepted by the NSS upstream, but the
SSL_GetStapledOCSPResponse function is renamed SSL_PeerStapledOCSPResponses
and the function prototype changed to use the new SECItemArray type.
Many source files contain only a trivial CVS keyword change because the
NSS upstream repository was migrated from CVS to hg (Mercurial).
R=agl@chromium.org,rsleevi@chromium.org
BUG=233732
TEST=no build errors or test failures
Review URL: https://chromiumcodereview.appspot.com/14522022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/ssl/sslplatf.c')
| -rw-r--r-- | net/third_party/nss/ssl/sslplatf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/third_party/nss/ssl/sslplatf.c b/net/third_party/nss/ssl/sslplatf.c index cc3c7c6..93ea288 100644 --- a/net/third_party/nss/ssl/sslplatf.c +++ b/net/third_party/nss/ssl/sslplatf.c @@ -110,7 +110,7 @@ ssl_FreePlatformKey(PlatformKey key) } SECStatus -ssl3_PlatformSignHashes(SSL3Hashes *hash, PlatformKey key, SECItem *buf, +ssl3_PlatformSignHashes(SSL3Hashes *hash, PlatformKey key, SECItem *buf, PRBool isTLS, KeyType keyType) { SECStatus rv = SECFailure; @@ -150,7 +150,7 @@ ssl3_PlatformSignHashes(SSL3Hashes *hash, PlatformKey key, SECItem *buf, if (!CryptCreateHash(key->hCryptProv, hashAlg, 0, 0, &hHash)) { PORT_SetError(SSL_ERROR_SIGN_HASHES_FAILURE); - goto done; + goto done; } argLen = sizeof(hashLen); if (!CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashLen, &argLen, 0)) { @@ -223,7 +223,7 @@ ssl_FreePlatformKey(PlatformKey key) } SECStatus -ssl3_PlatformSignHashes(SSL3Hashes *hash, PlatformKey key, SECItem *buf, +ssl3_PlatformSignHashes(SSL3Hashes *hash, PlatformKey key, SECItem *buf, PRBool isTLS, KeyType keyType) { SECStatus rv = SECFailure; @@ -257,7 +257,7 @@ ssl3_PlatformSignHashes(SSL3Hashes *hash, PlatformKey key, SECItem *buf, * needed information is readily available on the key itself. */ signatureLen = (cssmKey->KeyHeader.LogicalKeySizeInBits + 7) / 8; - + if (signatureLen == 0) { PORT_SetError(SEC_ERROR_INVALID_KEY); goto done; @@ -305,7 +305,7 @@ ssl3_PlatformSignHashes(SSL3Hashes *hash, PlatformKey key, SECItem *buf, signatureData.Length = signatureLen; signatureData.Data = (uint8*)buf->data; - + cssmRv = CSSM_CSP_CreateSignatureContext(cspHandle, sigAlg, cssmCreds, cssmKey, &cssmSignature); if (cssmRv) { |