1 files changed, 7 insertions, 0 deletions

diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c
index 6981852b5b..ed0fcfc532 100644
--- a/src/lib/libssl/s3_both.c
+++ b/src/lib/libssl/s3_both.c
@@ -161,6 +161,8 @@ int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen)
 
                 i=s->method->ssl3_enc->final_finish_mac(s,
                         sender,slen,s->s3->tmp.finish_md);
+                if (i == 0)
+                        return 0;
                 s->s3->tmp.finish_md_len = i;
                 memcpy(p, s->s3->tmp.finish_md, i);
                 p+=i;
@@ -208,6 +210,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;