diff options
| author | Tim Taubert <ttaubert@mozilla.com> | 2018-01-26 16:12:59 +0100 |
|---|---|---|
| committer | Tim Taubert <ttaubert@mozilla.com> | 2018-01-26 16:12:59 +0100 |
| commit | 9556be22ec5f2b0919449a8e8d6036942420d23e (patch) | |
| tree | 391fe87a263f56f825a1ec9020b411735b6a2b9f /lib/ssl/ssl3con.c | |
| parent | dfec770f0af1f935d30eb323abd80522dc336671 (diff) | |
| download | nss-hg-9556be22ec5f2b0919449a8e8d6036942420d23e.tar.gz | |
Bug 1432824 - Add clang-5.0 extra build to Taskcluster r=franziskus
Reviewers: franziskus
Reviewed By: franziskus
Bug #: 1432824
Differential Revision: https://phabricator.services.mozilla.com/D435
Diffstat (limited to 'lib/ssl/ssl3con.c')
| -rw-r--r-- | lib/ssl/ssl3con.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c index bffafa3d1..89fd06dfc 100644 --- a/lib/ssl/ssl3con.c +++ b/lib/ssl/ssl3con.c @@ -4272,6 +4272,7 @@ ssl3_ComputeHandshakeHashes(sslSocket *ss, sizeof(stackBuf), &stateLen); if (stateBuf == NULL) { ssl_MapLowLevelError(SSL_ERROR_DIGEST_FAILURE); + rv = SECFailure; goto tls12_loser; } rv |= PK11_DigestFinal(h, hashes->u.raw, &hashes->len, @@ -4283,7 +4284,6 @@ ssl3_ComputeHandshakeHashes(sslSocket *ss, } hashes->hashAlg = ssl3_GetSuitePrfHash(ss); - rv = SECSuccess; tls12_loser: if (stateBuf) { @@ -4315,6 +4315,7 @@ ssl3_ComputeHandshakeHashes(sslSocket *ss, sizeof md5StackBuf, &md5StateLen); if (md5StateBuf == NULL) { ssl_MapLowLevelError(SSL_ERROR_MD5_DIGEST_FAILURE); + rv = SECFailure; goto loser; } md5 = ss->ssl3.hs.md5; @@ -4323,6 +4324,7 @@ ssl3_ComputeHandshakeHashes(sslSocket *ss, sizeof shaStackBuf, &shaStateLen); if (shaStateBuf == NULL) { ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE); + rv = SECFailure; goto loser; } sha = ss->ssl3.hs.sha; @@ -4418,7 +4420,6 @@ ssl3_ComputeHandshakeHashes(sslSocket *ss, PRINT_BUF(60, (NULL, "SHA outer: result", hashes->u.s.sha, SHA1_LENGTH)); hashes->len = MD5_LENGTH + SHA1_LENGTH; - rv = SECSuccess; loser: if (md5StateBuf) { |