[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  dc8da7b1b8ba276f179ea1232c9df764dcd38775 (commit)
       via  cff55b90e95e1fa6c90154f93f12363e761d88c7 (commit)
      from  0acee5045aa5d07242b02ce6fb7ab88a920799c6 (commit)


- Log -----------------------------------------------------------------
commit dc8da7b1b8ba276f179ea1232c9df764dcd38775
Author: Qin Long <qin.long at intel.com>
Date:   Wed Mar 15 23:43:20 2017 +0800

    Fix the build warning under OPENSSL_NO_GOST
    
    Variable 'pktype' was set but not used under OPENSSL_NO_GOST. This change
    will fix the build warning under [-Werror=unused-but-set-variable].
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2961)

commit cff55b90e95e1fa6c90154f93f12363e761d88c7
Author: Qin Long <qin.long at intel.com>
Date:   Wed Mar 15 23:33:57 2017 +0800

    Cleaning UEFI Build with additional OPENSSL_SYS_UEFI flags
    
    Add OPENSSL_SYS_UEFI to remove unused syslog and uid stuffs for
    more clean UEFI build.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2961)

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

Summary of changes:
 crypto/uid.c            | 2 +-
 e_os.h                  | 2 +-
 ssl/statem/statem_lib.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/uid.c b/crypto/uid.c
index 9756d51..4e1890f 100644
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -19,7 +19,7 @@ int OPENSSL_issetugid(void)
     return issetugid();
 }
 
-#elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS)
+#elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
 
 int OPENSSL_issetugid(void)
 {
diff --git a/e_os.h b/e_os.h
index f255aa9..241e0ba 100644
--- a/e_os.h
+++ b/e_os.h
@@ -87,7 +87,7 @@ extern "C" {
 #  define DEVRANDOM_EGD "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy"
 # endif
 
-# if defined(OPENSSL_SYS_VXWORKS)
+# if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
 #  define NO_SYS_PARAM_H
 #  define NO_CHMOD
 #  define NO_SYSLOG
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 0cde2e7..860b814 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -281,7 +281,7 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
     unsigned char *gost_data = NULL;
 #endif
     int al = SSL_AD_INTERNAL_ERROR, ret = MSG_PROCESS_ERROR;
-    int type = 0, j, pktype;
+    int type = 0, j;
     unsigned int len;
     X509 *peer;
     const EVP_MD *md = NULL;
@@ -303,7 +303,6 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
         goto f_err;
     }
 
-    pktype = EVP_PKEY_id(pkey);
     type = X509_certificate_type(peer, pkey);
 
     if (!(type & EVP_PKT_SIGN)) {
@@ -384,6 +383,7 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
     }
 #ifndef OPENSSL_NO_GOST
     {
+        int pktype = EVP_PKEY_id(pkey);
         if (pktype == NID_id_GostR3410_2001
             || pktype == NID_id_GostR3410_2012_256
             || pktype == NID_id_GostR3410_2012_512) {