Update the openssl b_print patch

Signed-off-by: Gary Lin <glin@suse.com>
This commit is contained in:
Gary Lin 2016-03-17 15:03:03 +08:00 committed by Peter Jones
parent afaf0a4205
commit e769628e0d

View File

@ -1,18 +1,18 @@
diff --git a/Cryptlib/OpenSSL/crypto/bio/b_print.c b/Cryptlib/OpenSSL/crypto/bio/b_print.c diff --git a/Cryptlib/OpenSSL/crypto/bio/b_print.c b/Cryptlib/OpenSSL/crypto/bio/b_print.c
index 7c81e25..9091d56 100644 index 90248fa..dfc26bc 100644
--- a/Cryptlib/OpenSSL/crypto/bio/b_print.c --- a/Cryptlib/OpenSSL/crypto/bio/b_print.c
+++ b/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 *, @@ -129,8 +129,10 @@ static int fmtstr(char **, char **, size_t *, size_t *,
const char *, int, int, int); const char *, int, int, int);
static void fmtint(char **, char **, size_t *, size_t *, static int fmtint(char **, char **, size_t *, size_t *,
LLONG, int, int, int, int); LLONG, int, int, int, int);
+#ifndef OPENSSL_SYS_UEFI +#ifndef OPENSSL_SYS_UEFI
static void fmtfp(char **, char **, size_t *, size_t *, static int fmtfp(char **, char **, size_t *, size_t *,
LDOUBLE, int, int, int); LDOUBLE, int, int, int);
+#endif +#endif
static void doapr_outch(char **, char **, size_t *, size_t *, int); static int doapr_outch(char **, char **, size_t *, size_t *, int);
static void _dopr(char **sbuffer, char **buffer, static int _dopr(char **sbuffer, char **buffer,
size_t *maxlen, size_t *retlen, int *truncated, size_t *maxlen, size_t *retlen, int *truncated,
@@ -173,7 +175,9 @@ _dopr(char **sbuffer, @@ -173,7 +175,9 @@ _dopr(char **sbuffer,
{ {
char ch; char ch;
@ -23,7 +23,7 @@ index 7c81e25..9091d56 100644
char *strvalue; char *strvalue;
int min; int min;
int max; int max;
@@ -275,10 +279,12 @@ _dopr(char **sbuffer, @@ -276,10 +280,12 @@ _dopr(char **sbuffer,
cflags = DP_C_LLONG; cflags = DP_C_LLONG;
ch = *format++; ch = *format++;
break; break;
@ -36,35 +36,35 @@ index 7c81e25..9091d56 100644
default: default:
break; break;
} }
@@ -330,6 +336,7 @@ _dopr(char **sbuffer, @@ -333,6 +339,7 @@ _dopr(char **sbuffer,
ch == 'o' ? 8 : (ch == 'u' ? 10 : 16), min, max, flags))
min, max, flags); return 0;
break; break;
+#ifndef OPENSSL_SYS_UEFI +#ifndef OPENSSL_SYS_UEFI
case 'f': case 'f':
if (cflags == DP_C_LDOUBLE) if (cflags == DP_C_LDOUBLE)
fvalue = va_arg(args, LDOUBLE); fvalue = va_arg(args, LDOUBLE);
@@ -354,6 +361,7 @@ _dopr(char **sbuffer, @@ -358,6 +365,7 @@ _dopr(char **sbuffer,
else else
fvalue = va_arg(args, double); fvalue = va_arg(args, double);
break; break;
+#endif +#endif
case 'c': case 'c':
doapr_outch(sbuffer, buffer, &currlen, maxlen, if(!doapr_outch(sbuffer, buffer, &currlen, maxlen,
va_arg(args, int)); va_arg(args, int)))
@@ -550,6 +558,7 @@ fmtint(char **sbuffer, @@ -575,6 +583,7 @@ fmtint(char **sbuffer,
return; return 1;
} }
+#ifndef OPENSSL_SYS_UEFI +#ifndef OPENSSL_SYS_UEFI
static LDOUBLE abs_val(LDOUBLE value) static LDOUBLE abs_val(LDOUBLE value)
{ {
LDOUBLE result = value; LDOUBLE result = value;
@@ -696,6 +705,7 @@ fmtfp(char **sbuffer, @@ -733,6 +742,7 @@ fmtfp(char **sbuffer,
++padlen;
} }
return 1;
} }
+#endif +#endif
static void #define BUFFER_INC 1024
doapr_outch(char **sbuffer,