/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
int ssl3_do_change_cipher_spec(SSL *s)
{
int i;
- size_t finish_md_len;
- const char *sender;
- size_t slen;
if (s->server)
i = SSL3_CHANGE_CIPHER_SERVER_READ;
}
s->session->cipher = s->s3->tmp.new_cipher;
- if (!s->method->ssl3_enc->setup_key_block(s))
+ if (!s->method->ssl3_enc->setup_key_block(s)) {
+ /* SSLfatal() already called */
return 0;
+ }
}
- if (!s->method->ssl3_enc->change_cipher_state(s, i))
- return 0;
-
- /*
- * we have to record the message digest at this point so we can get it
- * before we read the finished message
- */
- if (!s->server) {
- sender = s->method->ssl3_enc->server_finished_label;
- slen = s->method->ssl3_enc->server_finished_label_len;
- } else {
- sender = s->method->ssl3_enc->client_finished_label;
- slen = s->method->ssl3_enc->client_finished_label_len;
- }
-
- finish_md_len = s->method->ssl3_enc->final_finish_mac(s, sender, slen,
- s->s3->tmp.peer_finish_md);
- if (finish_md_len == 0) {
- SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR);
+ if (!s->method->ssl3_enc->change_cipher_state(s, i)) {
+ /* SSLfatal() already called */
return 0;
}
- s->s3->tmp.peer_finish_md_len = finish_md_len;
return 1;
}