mirror of
https://git.proxmox.com/git/efi-boot-shim
synced 2025-06-12 20:49:58 +00:00
4da6ac8195
- Update update.sh to copy the openssl 1.1.0 source files - Refresh the supplemental patch to reflect the change Signed-off-by: Gary Lin <glin@suse.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 e91ab6d..f33caa2 100644
|
|
--- a/Cryptlib/OpenSSL/crypto/bio/b_print.c
|
|
+++ b/Cryptlib/OpenSSL/crypto/bio/b_print.c
|
|
@@ -51,8 +51,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, 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,
|
|
@@ -107,7 +109,9 @@ _dopr(char **sbuffer,
|
|
{
|
|
char ch;
|
|
LLONG value;
|
|
+#ifndef OPENSSL_SYS_UEFI
|
|
LDOUBLE fvalue;
|
|
+#endif
|
|
char *strvalue;
|
|
int min;
|
|
int max;
|
|
@@ -210,10 +214,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;
|
|
}
|
|
@@ -267,6 +273,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);
|
|
@@ -298,6 +305,7 @@ _dopr(char **sbuffer,
|
|
flags, G_FORMAT))
|
|
return 0;
|
|
break;
|
|
+#endif
|
|
case 'c':
|
|
if(!doapr_outch(sbuffer, buffer, &currlen, maxlen,
|
|
va_arg(args, int)))
|
|
@@ -530,6 +538,7 @@ fmtint(char **sbuffer,
|
|
return 1;
|
|
}
|
|
|
|
+#ifndef OPENSSL_SYS_UEFI
|
|
static LDOUBLE abs_val(LDOUBLE value)
|
|
{
|
|
LDOUBLE result = value;
|
|
@@ -816,6 +825,7 @@ fmtfp(char **sbuffer,
|
|
}
|
|
return 1;
|
|
}
|
|
+#endif
|
|
|
|
#define BUFFER_INC 1024
|
|
|