mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-01 05:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

crypto/uid.c: use own macro as guard rather than AT_SECURE

Browse Source 
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@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7933)
This commit is contained in:
Richard Levitte 2018-12-20 10:17:38 +01:00
parent ea09abc808
commit aefb980c45
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/uid.c
View File

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