efi-boot-shim/Cryptlib/OpenSSL/openssl-bio-b_print-disable-sse.patch
Gary Ching-Pang Lin 4ac84f8673 Update openssl to 1.0.2d
Also update Cryptlib to edk2 r17731

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
2015-07-28 11:46:38 -04:00

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 7c81e25..9091d56 100644
--- a/Cryptlib/OpenSSL/crypto/bio/b_print.c
+++ b/Cryptlib/OpenSSL/crypto/bio/b_print.c
@@ -129,8 +129,10 @@ static void fmtstr(char **, char **, size_t *, size_t *,
const char *, int, int, int);
static void fmtint(char **, char **, size_t *, size_t *,
LLONG, int, int, int, int);
+#ifndef OPENSSL_SYS_UEFI
static void fmtfp(char **, char **, size_t *, size_t *,
LDOUBLE, int, int, int);
+#endif
static void doapr_outch(char **, char **, size_t *, size_t *, int);
static void _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;
@@ -275,10 +279,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;
}
@@ -330,6 +336,7 @@ _dopr(char **sbuffer,
ch == 'o' ? 8 : (ch == 'u' ? 10 : 16),
min, max, flags);
break;
+#ifndef OPENSSL_SYS_UEFI
case 'f':
if (cflags == DP_C_LDOUBLE)
fvalue = va_arg(args, LDOUBLE);
@@ -354,6 +361,7 @@ _dopr(char **sbuffer,
else
fvalue = va_arg(args, double);
break;
+#endif
case 'c':
doapr_outch(sbuffer, buffer, &currlen, maxlen,
va_arg(args, int));
@@ -550,6 +558,7 @@ fmtint(char **sbuffer,
return;
}
+#ifndef OPENSSL_SYS_UEFI
static LDOUBLE abs_val(LDOUBLE value)
{
LDOUBLE result = value;
@@ -696,6 +705,7 @@ fmtfp(char **sbuffer,
++padlen;
}
}
+#endif
static void
doapr_outch(char **sbuffer,