[openssl-commits] [openssl] OpenSSL_1_1_1-stable update

[Richard Levitte]

The branch OpenSSL_1_1_1-stable has been updated
       via  6ffcd10ade7fac6cd08dff3dba304b9d8d9de0a4 (commit)
      from  0c13c8ece1fd88acf757e385bbc865e1e94382ed (commit)


- Log -----------------------------------------------------------------
commit 6ffcd10ade7fac6cd08dff3dba304b9d8d9de0a4
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 20 10:17:38 2018 +0100

    crypto/uid.c: use own macro as guard rather than AT_SECURE
    
    It turns out that AT_SECURE may be defined through other means than
    our inclusion of sys/auxv.h, so to be on the safe side, we define our
    own guard and use that to determine if getauxval() should be used or
    not.
    
    Fixes #7932
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7933)
    
    (cherry picked from commit aefb980c45134d84f1757de1a9c61d699c8a7e33)

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

Summary of changes:
 crypto/uid.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/uid.c b/crypto/uid.c
index f7ae261..e1c08a7 100644
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -34,12 +34,13 @@ int OPENSSL_issetugid(void)
 # if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
 #  if __GLIBC_PREREQ(2, 16)
 #   include <sys/auxv.h>
+#   define OSSL_IMPLEMENT_GETAUXVAL
 #  endif
 # endif
 
 int OPENSSL_issetugid(void)
 {
-# ifdef AT_SECURE
+# ifdef OSSL_IMPLEMENT_GETAUXVAL
     return getauxval(AT_SECURE) != 0;
 # else
     return getuid() != geteuid() || getgid() != getegid();