[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  5c001c326d7731042a602a171f1363191e9b0336 (commit)
       via  d94ce4100fb39dc12ceec38b1d14267a4c7e64b3 (commit)
       via  e93836b95e120a64d005a99f4bf0dde3a4d2ef3e (commit)
      from  bfb155c187fbb1e56561614925be5ca4ef069f03 (commit)


- Log -----------------------------------------------------------------
commit 5c001c326d7731042a602a171f1363191e9b0336
Author: Ben Laurie <ben at links.org>
Date:   Tue Apr 19 08:25:58 2016 +0100

    Fix no-gost no-srp no-ec no-dh.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit d94ce4100fb39dc12ceec38b1d14267a4c7e64b3
Author: Ben Laurie <ben at links.org>
Date:   Mon Apr 18 10:45:02 2016 +0100

    Fix enable-ssl-trace no-nextprotoneg.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit e93836b95e120a64d005a99f4bf0dde3a4d2ef3e
Author: Ben Laurie <ben at links.org>
Date:   Mon Apr 18 10:44:42 2016 +0100

    Fix no-engine no-ui.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 apps/apps.c              | 2 ++
 ssl/statem/statem_srvr.c | 5 ++++-
 ssl/t1_trce.c            | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index 8cf3b59..a80a07e 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -156,7 +156,9 @@ typedef struct {
     unsigned long mask;
 } NAME_EX_TBL;
 
+#if !defined(OPENSSL_NO_UI) || !defined(OPENSSL_NO_ENGINE)
 static UI_METHOD *ui_method = NULL;
+#endif
 
 static int set_table_opts(unsigned long *flags, const char *arg,
                           const NAME_EX_TBL * in_tbl);
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 38fa945..4bb22e5 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2079,7 +2079,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
     EVP_PKEY *ckey = NULL;
 #endif
     PACKET enc_premaster;
-    const unsigned char *data;
     unsigned char *rsa_decrypt = NULL;
 
     alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
@@ -2301,6 +2300,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
         DH *cdh;
         unsigned int i;
         BIGNUM *pub_key;
+        const unsigned char *data;
 
         if (!PACKET_get_net_2(pkt, &i)) {
             if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) {
@@ -2378,6 +2378,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
             goto f_err;
         } else {
             unsigned int i;
+            const unsigned char *data;
 
             /*
              * Get client's public key from encoded point in the
@@ -2425,6 +2426,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
 #ifndef OPENSSL_NO_SRP
     if (alg_k & SSL_kSRP) {
         unsigned int i;
+        const unsigned char *data;
 
         if (!PACKET_get_net_2(pkt, &i)
                 || !PACKET_get_bytes(pkt, &data, i)) {
@@ -2467,6 +2469,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
         int Ttag, Tclass;
         long Tlen;
         long sess_key_len;
+        const unsigned char *data;
 
         /* Get our certificate private key */
         alg_a = s->s3->tmp.new_cipher->algorithm_auth;
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index cb22d49..b56b504 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -497,7 +497,9 @@ static ssl_trace_tbl ssl_exts_tbl[] = {
     {TLSEXT_TYPE_heartbeat, "heartbeat"},
     {TLSEXT_TYPE_session_ticket, "session_ticket"},
     {TLSEXT_TYPE_renegotiate, "renegotiate"},
+#ifndef OPENSSL_NO_NEXTPROTONEG
     {TLSEXT_TYPE_next_proto_neg, "next_proto_neg"},
+#endif
     {TLSEXT_TYPE_signed_certificate_timestamp, "signed_certificate_timestamps"},
     {TLSEXT_TYPE_padding, "padding"},
     {TLSEXT_TYPE_encrypt_then_mac, "encrypt_then_mac"},