From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 12 Jan 2022 11:35:16 +0000 (+0100)
Subject: Revert "crypto/bio: fix build on UEFI"
X-Git-Tag: openssl-3.2.0-alpha1~3036
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=619c9bad41d041bab2ac6ba3933d526b48ceee2a;p=thirdparty%2Fopenssl.git

Revert "crypto/bio: fix build on UEFI"

This reverts commit 328bf5adf9e23da523d4195db309083aa02403c4.

Turned out it isn't that simple, the fix is incomplete.
So revert and try again with another approach.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17547)
---

diff --git a/crypto/bio/bio_print.c b/crypto/bio/bio_print.c
index 60b28c61ff0..1ea9a1a3c69 100644
--- a/crypto/bio/bio_print.c
+++ b/crypto/bio/bio_print.c
@@ -13,7 +13,6 @@
 #include "crypto/ctype.h"
 #include "internal/numbers.h"
 #include <openssl/bio.h>
-#include <openssl/configuration.h>
 
 /*
  * Copyright Patrick Powell 1995
@@ -513,11 +512,7 @@ fmtint(char **sbuffer,
     return 1;
 }
 
-#ifdef OPENSSL_SYS_UEFI
-static LDOUBLE EFIAPI abs_val(LDOUBLE value)
-#else
 static LDOUBLE abs_val(LDOUBLE value)
-#endif
 {
     LDOUBLE result = value;
     if (value < 0)
@@ -525,11 +520,7 @@ static LDOUBLE abs_val(LDOUBLE value)
     return result;
 }
 
-#ifdef OPENSSL_SYS_UEFI
-static LDOUBLE EFIAPI pow_10(int in_exp)
-#else
 static LDOUBLE pow_10(int in_exp)
-#endif
 {
     LDOUBLE result = 1;
     while (in_exp) {