mirror of
https://git.proxmox.com/git/efi-boot-shim
synced 2025-06-14 01:11:25 +00:00
1d39ada8cb
OpenSSL changes quite a bit of the key validation, and most of the keys I can find in the wild aren't marked as trusted by the new checker. Intel noticed this too: https://github.com/vathpela/edk2/commit/f536d7c3ed but instead of fixing the compatibility error, they switched their test data to match the bug. So that's pretty broken. For now, I'm reverting OpenSSL 1.1.0e, because we need those certs in the wild to work. This reverts commit513cbe2aea. This reverts commite9cc33d6f2. This reverts commit80d49f758e. This reverts commit9bc647e2b2. This reverts commitae75df6232. This reverts commite883479f35. This reverts commit97469449fd. This reverts commite39692647f. This reverts commit0f3dfc01e2. This reverts commit4da6ac8195. This reverts commitd064bd7eef. This reverts commit9bc86cfd6f. This reverts commitab9a05a10f. Signed-off-by: Peter Jones <pjones@redhat.com>
71 lines
2.1 KiB
Diff
71 lines
2.1 KiB
Diff
diff --git a/Cryptlib/OpenSSL/crypto/bio/b_print.c b/Cryptlib/OpenSSL/crypto/bio/b_print.c
|
|
index 90248fa..dfc26bc 100644
|
|
--- a/Cryptlib/OpenSSL/crypto/bio/b_print.c
|
|
+++ b/Cryptlib/OpenSSL/crypto/bio/b_print.c
|
|
@@ -129,8 +129,10 @@ static int fmtstr(char **, char **, size_t *, size_t *,
|
|
const char *, int, int, int);
|
|
static int fmtint(char **, char **, size_t *, size_t *,
|
|
LLONG, int, int, int, int);
|
|
+#ifndef OPENSSL_SYS_UEFI
|
|
static int fmtfp(char **, char **, size_t *, size_t *,
|
|
LDOUBLE, int, int, int);
|
|
+#endif
|
|
static int doapr_outch(char **, char **, size_t *, size_t *, int);
|
|
static int _dopr(char **sbuffer, char **buffer,
|
|
size_t *maxlen, size_t *retlen, int *truncated,
|
|
@@ -173,7 +175,9 @@ _dopr(char **sbuffer,
|
|
{
|
|
char ch;
|
|
LLONG value;
|
|
+#ifndef OPENSSL_SYS_UEFI
|
|
LDOUBLE fvalue;
|
|
+#endif
|
|
char *strvalue;
|
|
int min;
|
|
int max;
|
|
@@ -276,10 +280,12 @@ _dopr(char **sbuffer,
|
|
cflags = DP_C_LLONG;
|
|
ch = *format++;
|
|
break;
|
|
+#ifndef OPENSSL_SYS_UEFI
|
|
case 'L':
|
|
cflags = DP_C_LDOUBLE;
|
|
ch = *format++;
|
|
break;
|
|
+#endif
|
|
default:
|
|
break;
|
|
}
|
|
@@ -333,6 +339,7 @@ _dopr(char **sbuffer,
|
|
min, max, flags))
|
|
return 0;
|
|
break;
|
|
+#ifndef OPENSSL_SYS_UEFI
|
|
case 'f':
|
|
if (cflags == DP_C_LDOUBLE)
|
|
fvalue = va_arg(args, LDOUBLE);
|
|
@@ -358,6 +365,7 @@ _dopr(char **sbuffer,
|
|
else
|
|
fvalue = va_arg(args, double);
|
|
break;
|
|
+#endif
|
|
case 'c':
|
|
if(!doapr_outch(sbuffer, buffer, &currlen, maxlen,
|
|
va_arg(args, int)))
|
|
@@ -575,6 +583,7 @@ fmtint(char **sbuffer,
|
|
return 1;
|
|
}
|
|
|
|
+#ifndef OPENSSL_SYS_UEFI
|
|
static LDOUBLE abs_val(LDOUBLE value)
|
|
{
|
|
LDOUBLE result = value;
|
|
@@ -733,6 +742,7 @@ fmtfp(char **sbuffer,
|
|
}
|
|
return 1;
|
|
}
|
|
+#endif
|
|
|
|
#define BUFFER_INC 1024
|
|
|