]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Openssl fails to compile on Debian with kfreebsd kernels
authorMattias Ellert <mattias.ellert@physics.uu.se>
Tue, 31 Aug 2021 06:26:06 +0000 (08:26 +0200)
committerPauli <pauli@openssl.org>
Thu, 2 Sep 2021 00:05:25 +0000 (10:05 +1000)
(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 <kaduk@mit.edu>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16477)

(cherry picked from commit 3a1fa0116a92235ba200228e4bb60d6a3a7f4113)

crypto/uid.c

index 5e3315eeb2e3885a86b784c05814ab0d8f3b2538..a9eae36818ca77232a57a237e33d36e49248bd98 100644 (file)
@@ -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