[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  e24bdcde5a80a7edeb1e0dbbcf45c3353a974974 (commit)
      from  2be8c56a39b0ec2ec5af6ceaf729df154d784a43 (commit)


- Log -----------------------------------------------------------------
commit e24bdcde5a80a7edeb1e0dbbcf45c3353a974974
Author: Rebecca Cran <rebecca at bluestop.org>
Date:   Tue Jun 18 13:02:32 2019 +1000

     Swap #if blocks in uid.c so target platform gets checked before host
    
    This avoids the case where a UEFI build on FreeBSD tries to call the system
    issetugid function instead of returning 0 as it should do.
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from #9158)

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

Summary of changes:
 crypto/uid.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto/uid.c b/crypto/uid.c
index 494dbde..3ae93f6 100644
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -10,20 +10,20 @@
 #include <openssl/crypto.h>
 #include <openssl/opensslconf.h>
 
-#if defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) || defined(__DragonFly__)
-
-# include OPENSSL_UNISTD
+#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
 
 int OPENSSL_issetugid(void)
 {
-    return issetugid();
+    return 0;
 }
 
-#elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
+#elif defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) || defined(__DragonFly__)
+
+# include OPENSSL_UNISTD
 
 int OPENSSL_issetugid(void)
 {
-    return 0;
+    return issetugid();
 }
 
 #else