kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unnecessary parameter.

Browse Source 
Change-Id: Ib6708b9a9f89ab8d548850575762032a36f9ba2f
Reviewed-on: https://boringssl-review.googlesource.com/19884
Commit-Queue: Steven Valdez <svaldez@google.com>
Reviewed-by: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2017-08-31 01:12:28 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 0a471910b4
commit 6abaa316f0
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssl/handshake.cc
View File

@ -402,8 +402,7 @@ enum ssl_hs_wait_t ssl_get_finished(SSL_HANDSHAKE *hs) {
uint8_t finished[EVP_MAX_MD_SIZE];
size_t finished_len;
if (!hs->transcript.GetFinishedMAC(finished, &finished_len,
SSL_get_session(ssl), !ssl->server,
ssl3_protocol_version(ssl)) ||
SSL_get_session(ssl), !ssl->server) ||
!ssl_hash_message(hs, msg)) {
return ssl_hs_error;
}

2
ssl/internal.h
View File

@ -437,7 +437,7 @@ class SSLTranscript {
// have room for |EVP_MAX_MD_SIZE| bytes. It returns true on success and false
// on failure.
bool GetFinishedMAC(uint8_t *out, size_t *out_len, const SSL_SESSION *session,
bool from_server, uint16_t version);
bool from_server);
private:
// buffer_, if non-null, contains the handshake transcript.

2
ssl/s3_both.cc
View File

@ -302,7 +302,7 @@ int ssl3_send_finished(SSL_HANDSHAKE *hs) {
uint8_t finished[EVP_MAX_MD_SIZE];
size_t finished_len;
if (!hs->transcript.GetFinishedMAC(finished, &finished_len, session,
ssl->server, ssl3_protocol_version(ssl))) {
ssl->server)) {
return 0;
}

6
ssl/ssl_transcript.cc
View File

@ -328,9 +328,9 @@ bool SSLTranscript::GetSSL3CertVerifyHash(uint8_t *out, size_t *out_len,
}
bool SSLTranscript::GetFinishedMAC(uint8_t *out, size_t *out_len,
const SSL_SESSION *session, bool from_server,
uint16_t version) {
if (version == SSL3_VERSION) {
const SSL_SESSION *session,
bool from_server) {
if (session->ssl_version == SSL3_VERSION) {
if (Digest() != EVP_md5_sha1()) {
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
return false;