[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  bbafa47b554fa2c89cf944951c170bbe21edf469 (commit)
      from  6f73d28c20459034bfd4090494be9fb1a479c8af (commit)


- Log -----------------------------------------------------------------
commit bbafa47b554fa2c89cf944951c170bbe21edf469
Author: Emilia Kasper <emilia at openssl.org>
Date:   Thu Oct 15 13:27:55 2015 +0200

    Appease gcc's Wmaybe-uninitialized
    
    False positive: gcc (4.8) can't figure out the SSL_IS_DTLS logic.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/s3_srvr.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index ca11c6e..7bf5828 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -883,6 +883,7 @@ int ssl3_get_client_hello(SSL *s)
 
     is_v2_record = RECORD_LAYER_is_sslv2_record(&s->rlayer);
 
+    PACKET_null_init(&cookie);
     /* First lets get s->client_version set correctly */
     if (is_v2_record) {
         unsigned int version;
@@ -1052,8 +1053,6 @@ int ssl3_get_client_hello(SSL *s)
 
         PACKET_null_init(&compression);
         PACKET_null_init(&extensions);
-        /* We're never DTLS here but just play safe and initialize. */
-        PACKET_null_init(&cookie);
     } else {
         /* Regular ClientHello. */
         if (!PACKET_copy_bytes(&pkt, s->s3->client_random, SSL3_RANDOM_SIZE)