code.ossystems Code Review - openembedded-core.git/blob

   1 From 197e0ea817ad64820789d86711d55ff50d71f631 Mon Sep 17 00:00:00 2001
   2 From: "Dr. Stephen Henson" <steve@openssl.org>
   3 Date: Mon, 6 Jan 2014 14:35:04 +0000
   4 Subject: [PATCH] Fix for TLS record tampering bug CVE-2013-4353
   5
   6 Upstream-Status: Backport
   7 commit 197e0ea817ad64820789d86711d55ff50d71f631 upstream
   8
   9  ssl/s3_both.c |    6 +++++-
  10  3 files changed, 11 insertions(+), 1 deletions(-)
  11
  12 diff --git a/ssl/s3_both.c b/ssl/s3_both.c
  13 index 1e5dcab..53b9390 100644
  14 --- a/ssl/s3_both.c
  15 +++ b/ssl/s3_both.c
  16 @@ -210,7 +210,11 @@ static void ssl3_take_mac(SSL *s)
  17         {
  18         const char *sender;
  19         int slen;
  20 -
  21 +       /* If no new cipher setup return immediately: other functions will
  22 +        * set the appropriate error.
  23 +        */
  24 +       if (s->s3->tmp.new_cipher == NULL)
  25 +               return;
  26         if (s->state & SSL_ST_CONNECT)
  27                 {
  28                 sender=s->method->ssl3_enc->server_finished_label;
  29 --
  30 1.7.5.4
  31