← Back to branch summary

~helen-fornazier/shim/trunk

« back to all changes in this revision

Viewing changes to Cryptlib/OpenSSL/openssl-bio-b_print-disable-sse.patch

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2016-09-22 00:29:42 UTC
  • mto: This revision was merged to the branch mainline in revision 107.
  • Revision ID: mathieu.trudel-lapierre@canonical.com-20160922002942-volexao40gxxs0qs
Tags: upstream-0.9+1474479173.6c180c6
Import upstream version 0.9+1474479173.6c180c6

Show diffs side-by-side

added added

removed removed

Lines of Context:
Cryptlib/OpenSSL/openssl-bio-b_print-disable-sse.patch
1
1
diff --git a/Cryptlib/OpenSSL/crypto/bio/b_print.c b/Cryptlib/OpenSSL/crypto/bio/b_print.c
2
 
index 7c81e25..9091d56 100644
 
2
index 90248fa..dfc26bc 100644
3
3
--- a/Cryptlib/OpenSSL/crypto/bio/b_print.c
4
4
+++ b/Cryptlib/OpenSSL/crypto/bio/b_print.c
5
 
@@ -129,8 +129,10 @@ static void fmtstr(char **, char **, size_t *, size_t *,
6
 
                    const char *, int, int, int);
7
 
 static void fmtint(char **, char **, size_t *, size_t *,
8
 
                    LLONG, int, int, int, int);
 
5
@@ -129,8 +129,10 @@ static int fmtstr(char **, char **, size_t *, size_t *,
 
6
                   const char *, int, int, int);
 
7
 static int fmtint(char **, char **, size_t *, size_t *,
 
8
                   LLONG, int, int, int, int);
9
9
+#ifndef OPENSSL_SYS_UEFI
10
 
 static void fmtfp(char **, char **, size_t *, size_t *,
11
 
                   LDOUBLE, int, int, int);
 
10
 static int fmtfp(char **, char **, size_t *, size_t *,
 
11
                  LDOUBLE, int, int, int);
12
12
+#endif
13
 
 static void doapr_outch(char **, char **, size_t *, size_t *, int);
14
 
 static void _dopr(char **sbuffer, char **buffer,
15
 
                   size_t *maxlen, size_t *retlen, int *truncated,
 
13
 static int doapr_outch(char **, char **, size_t *, size_t *, int);
 
14
 static int _dopr(char **sbuffer, char **buffer,
 
15
                  size_t *maxlen, size_t *retlen, int *truncated,
16
16
@@ -173,7 +175,9 @@ _dopr(char **sbuffer,
17
17
 {
18
18
     char ch;
23
23
     char *strvalue;
24
24
     int min;
25
25
     int max;
26
 
@@ -275,10 +279,12 @@ _dopr(char **sbuffer,
 
26
@@ -276,10 +280,12 @@ _dopr(char **sbuffer,
27
27
                 cflags = DP_C_LLONG;
28
28
                 ch = *format++;
29
29
                 break;
36
36
             default:
37
37
                 break;
38
38
             }
39
 
@@ -330,6 +336,7 @@ _dopr(char **sbuffer,
40
 
                        ch == 'o' ? 8 : (ch == 'u' ? 10 : 16),
41
 
                        min, max, flags);
 
39
@@ -333,6 +339,7 @@ _dopr(char **sbuffer,
 
40
                             min, max, flags))
 
41
                     return 0;
42
42
                 break;
43
43
+#ifndef OPENSSL_SYS_UEFI
44
44
             case 'f':
45
45
                 if (cflags == DP_C_LDOUBLE)
46
46
                     fvalue = va_arg(args, LDOUBLE);
47
 
@@ -354,6 +361,7 @@ _dopr(char **sbuffer,
 
47
@@ -358,6 +365,7 @@ _dopr(char **sbuffer,
48
48
                 else
49
49
                     fvalue = va_arg(args, double);
50
50
                 break;
51
51
+#endif
52
52
             case 'c':
53
 
                 doapr_outch(sbuffer, buffer, &currlen, maxlen,
54
 
                             va_arg(args, int));
55
 
@@ -550,6 +558,7 @@ fmtint(char **sbuffer,
56
 
     return;
 
53
                 if(!doapr_outch(sbuffer, buffer, &currlen, maxlen,
 
54
                             va_arg(args, int)))
 
55
@@ -575,6 +583,7 @@ fmtint(char **sbuffer,
 
56
     return 1;
57
57
 }
58
58
 
59
59
+#ifndef OPENSSL_SYS_UEFI
60
60
 static LDOUBLE abs_val(LDOUBLE value)
61
61
 {
62
62
     LDOUBLE result = value;
63
 
@@ -696,6 +705,7 @@ fmtfp(char **sbuffer,
64
 
         ++padlen;
 
63
@@ -733,6 +742,7 @@ fmtfp(char **sbuffer,
65
64
     }
 
65
     return 1;
66
66
 }
67
67
+#endif
68
68
 
69
 
 static void
70
 
 doapr_outch(char **sbuffer,
 
69
 #define BUFFER_INC  1024
 
70