aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/s3_both.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssl/s3_both.c')
-rw-r--r--ssl/s3_both.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index ead01c82a14a..ae0ee27c41aa 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -208,7 +208,11 @@ static void ssl3_take_mac(SSL *s)
{
const char *sender;
int slen;
-
+ /* If no new cipher setup return immediately: other functions will
+ * set the appropriate error.
+ */
+ if (s->s3->tmp.new_cipher == NULL)
+ return;
if (s->state & SSL_ST_CONNECT)
{
sender=s->method->ssl3_enc->server_finished_label;