Changeset 94404 in vbox for trunk/src/libs/openssl-3.0.2/crypto/bio/bio_print.c

Timestamp:

Mar 31, 2022 9:00:36 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150730

Message:

libs/openssl: Update to 3.0.2 and switch to it, bugref:10128

Location:

trunk/src/libs/openssl-3.0.2

Files:

• . (modified) (1 prop)
• crypto/bio/bio_print.c (modified) (8 diffs)

trunk/src/libs/openssl-3.0.2

@@ -13 +13 @@
 /vendor/openssl/1.1.1k:145841-145843
 /vendor/openssl/3.0.1:150323-150324
-/vendor/openssl/current:147554-150322
+/vendor/openssl/3.0.2:150728-150729
+/vendor/openssl/current:147554-150727

@@ -13 +13 @@
 /vendor/openssl/1.1.1k:145841-145843
 /vendor/openssl/3.0.1:150323-150324
-/vendor/openssl/current:147554-150322
+/vendor/openssl/3.0.2:150728-150729
+/vendor/openssl/current:147554-150727

trunk/src/libs/openssl-3.0.2/crypto/bio/bio_print.c

@@ -1 +1 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -14 +14 @@
 #include "internal/numbers.h"
 #include <openssl/bio.h>
+#include <openssl/configuration.h>
 
 /*
@@ -32 +33 @@
 static int fmtint(char **, char **, size_t *, size_t *,
                   int64_t, 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,
@@ -89 +92 @@
     char ch;
     int64_t value;
+#ifndef OPENSSL_SYS_UEFI
     LDOUBLE fvalue;
+#endif
     char *strvalue;
     int min;
@@ -260 +265 @@
                     return 0;
                 break;
+#ifndef OPENSSL_SYS_UEFI
             case 'f':
                 if (cflags == DP_C_LDOUBLE)
@@ -293 +299 @@
                     return 0;
                 break;
+#else
+            case 'f':
+            case 'E':
+            case 'e':
+            case 'G':
+            case 'g':
+                /* not implemented for UEFI */
+                ERR_raise(ERR_LIB_BIO, ERR_R_UNSUPPORTED);
+                return 0;
+#endif
             case 'c':
                 if (!doapr_outch(sbuffer, buffer, &currlen, maxlen,
@@ -512 +528 @@
     return 1;
 }
+
+#ifndef OPENSSL_SYS_UEFI
 
 static LDOUBLE abs_val(LDOUBLE value)
@@ -808 +826 @@
 }
 
+#endif /* OPENSSL_SYS_UEFI */
+
 #define BUFFER_INC  1024
 

@@ -13 +13 @@
 /vendor/openssl/1.1.1k:145841-145843
 /vendor/openssl/3.0.1:150323-150324
-/vendor/openssl/current:147554-150322
+/vendor/openssl/3.0.2:150728-150729
+/vendor/openssl/current:147554-150727