[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  165cc51f4ed3b2b84db7e3e00ee7134a1b2a3574 (commit)
       via  f9df0a7775f483c175cda5832360cccd1db6943a (commit)
      from  f49452c297438ec349a76dfa38fa26a780084f96 (commit)


- Log -----------------------------------------------------------------
commit 165cc51f4ed3b2b84db7e3e00ee7134a1b2a3574
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Wed Oct 11 08:18:13 2017 -0500

    Appease -Werror=maybe-uninitialized
    
    test/bad_dtls_test.c: In function 'validate_client_hello':
    test/bad_dtls_test.c:128:33: error: 'u' may be used uninitialized in this function [-Werror=maybe-uninitialized]
         if (!PACKET_get_1(&pkt, &u) || u != SSL3_RT_HANDSHAKE)
                                     ^
    Apparently -O1 does not perform sufficient optimization to ascertain
    that PACKET_get_1 will always initialize u if it returns true.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4518)

commit f9df0a7775f483c175cda5832360cccd1db6943a
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Wed Oct 11 07:55:30 2017 -0500

    Move supportedgroup ext-block fields out of NO_EC
    
    Now that we are moving to support named FFDH groups, these fields are not
    ec-specific, so we need them to always be available.
    
    This fixes the no-ec --strict-warnings build, since gcc
    5.4.0-6ubuntu1~16.04.4 appears to always try to compile the static inline
    functions from ssl_locl.h, even when they are not used in the current
    compilation unit.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4518)

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

Summary of changes:
 ssl/ssl_locl.h       | 4 ++--
 test/bad_dtls_test.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index c73035d..78511c2 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -541,9 +541,9 @@ struct ssl_session_st {
 # ifndef OPENSSL_NO_EC
         size_t ecpointformats_len;
         unsigned char *ecpointformats; /* peer's list */
+# endif                         /* OPENSSL_NO_EC */
         size_t supportedgroups_len;
         uint16_t *supportedgroups; /* peer's list */
-# endif                         /* OPENSSL_NO_EC */
     /* RFC4507 info */
         unsigned char *tick; /* Session ticket */
         size_t ticklen;      /* Session ticket length */
@@ -1202,10 +1202,10 @@ struct ssl_st {
         size_t ecpointformats_len;
         /* our list */
         unsigned char *ecpointformats;
+# endif                         /* OPENSSL_NO_EC */
         size_t supportedgroups_len;
         /* our list */
         uint16_t *supportedgroups;
-# endif                         /* OPENSSL_NO_EC */
         /* TLS Session Ticket extension override */
         TLS_SESSION_TICKET_EXT *session_ticket;
         /* TLS Session Ticket extension callback */
diff --git a/test/bad_dtls_test.c b/test/bad_dtls_test.c
index 7f6ffdc..102de24 100644
--- a/test/bad_dtls_test.c
+++ b/test/bad_dtls_test.c
@@ -118,7 +118,7 @@ static int validate_client_hello(BIO *wbio)
     long len;
     unsigned char *data;
     int cookie_found = 0;
-    unsigned int u;
+    unsigned int u = 0;
 
     len = BIO_get_mem_data(wbio, (char **)&data);
     if (!PACKET_buf_init(&pkt, data, len))