The branch OpenSSL_1_1_1-stable has been updated
via 1f8e36720fff9bdc9f08fe24a38cc91b1b78ddb0 (commit)
from 35cefdcab0f474deafcd769a2eb93f2c0f07051e (commit)
- Log -----------------------------------------------------------------
commit 1f8e36720fff9bdc9f08fe24a38cc91b1b78ddb0
Author: Mattias Ellert <mattias.ell...@physics.uu.se>
Date: Tue Aug 31 08:26:06 2021 +0200
Openssl fails to compile on Debian with kfreebsd kernels
(kfreebsd-amd64, kfreebsd-i386). The error reported by the compiler
is:
../crypto/uid.c: In function 'OPENSSL_issetugid':
../crypto/uid.c:50:22: error: 'AT_SECURE' undeclared (first use in this
function)
50 | return getauxval(AT_SECURE) != 0;
| ^~~~~~~~~
This commit changes the code to use the freebsd code in this case.
This fixes the compilation.
CLA: trivial
Reviewed-by: Ben Kaduk <ka...@mit.edu>
Reviewed-by: Tomas Mraz <to...@openssl.org>
Reviewed-by: Paul Dale <pa...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16477)
(cherry picked from commit 3a1fa0116a92235ba200228e4bb60d6a3a7f4113)
-----------------------------------------------------------------------
Summary of changes:
crypto/uid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/uid.c b/crypto/uid.c
index 5e3315eeb2..a9eae36818 100644
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -17,7 +17,7 @@ int OPENSSL_issetugid(void)
return 0;
}
-#elif defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) ||
defined(__DragonFly__)
+#elif defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) ||
defined(__DragonFly__) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__))
# include OPENSSL_UNISTD
