Changeset 95219 in vbox for trunk/src/libs/openssl-3.0.3/providers/fips

Timestamp:

Jun 8, 2022 7:43:44 AM (3 years ago)

Author:

vboxsync

Message:

libs/openssl: Switched to v3.0.3, bugref:10128

Location:

trunk/src/libs/openssl-3.0.3

Files:

• . (modified) (1 prop)
• providers/fips/fipsprov.c (modified) (6 diffs)
• providers/fips/self_test.c (modified) (3 diffs)

trunk/src/libs/openssl-3.0.3

@@ -14 +14 @@
 /vendor/openssl/3.0.1:150323-150324
 /vendor/openssl/3.0.2:150728-150729
-/vendor/openssl/current:147554-150727
+/vendor/openssl/3.0.3:151497-151729
+/vendor/openssl/current:147554-151496

@@ -14 +14 @@
 /vendor/openssl/3.0.1:150323-150324
 /vendor/openssl/3.0.2:150728-150729
-/vendor/openssl/current:147554-150727
+/vendor/openssl/3.0.3:151497-151729
+/vendor/openssl/current:147554-151496

trunk/src/libs/openssl-3.0.3/providers/fips/fipsprov.c

@@ -1 +1 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -23 +23 @@
 #include "prov/seeding.h"
 #include "self_test.h"
+#include "internal/core.h"
 
 static const char FIPS_DEFAULT_PROPERTIES[] = "provider=fips,fips=yes";
@@ -35 +36 @@
 static OSSL_FUNC_provider_get_params_fn fips_get_params;
 static OSSL_FUNC_provider_query_operation_fn fips_query;
+
+/* Locale object accessor functions */
+#ifdef OPENSSL_SYS_MACOSX
+# include <xlocale.h>
+#else
+# include <locale.h>
+#endif
+
+#if defined OPENSSL_SYS_WINDOWS
+# define locale_t _locale_t
+# define freelocale _free_locale
+#endif
+static locale_t loc;
+
+static int fips_init_casecmp(void);
+static void fips_deinit_casecmp(void);
 
 #define ALGC(NAMES, FUNC, CHECK) { { NAMES, FIPS_DEFAULT_PROPERTIES, FUNC }, CHECK }
@@ -487 +504 @@
 }
 
+void *ossl_c_locale() {
+    return (void *)loc;
+}
+
+static int fips_init_casecmp(void) {
+# ifdef OPENSSL_SYS_WINDOWS
+    loc = _create_locale(LC_COLLATE, "C");
+# else
+    loc = newlocale(LC_COLLATE_MASK, "C", (locale_t) 0);
+# endif
+    return (loc == (locale_t) 0) ? 0 : 1;
+}
+
+static void fips_deinit_casecmp(void) {
+    freelocale(loc);
+}
+
 static void fips_teardown(void *provctx)
 {
@@ -499 +533 @@
      * so no need to destroy it here.
      */
+    fips_deinit_casecmp();
     ossl_prov_ctx_free(provctx);
 }
@@ -548 +583 @@
     memset(&selftest_params, 0, sizeof(selftest_params));
 
+    if (!fips_init_casecmp())
+        return 0;
     if (!ossl_prov_seeding_from_dispatch(in))
         return 0;

trunk/src/libs/openssl-3.0.3/providers/fips/self_test.c

@@ -1 +1 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -104 +104 @@
     return TRUE;
 }
+
+#elif defined(__GNUC__)
+# undef DEP_INIT_ATTRIBUTE
+# undef DEP_FINI_ATTRIBUTE
+# define DEP_INIT_ATTRIBUTE static __attribute__((constructor))
+# define DEP_FINI_ATTRIBUTE static __attribute__((destructor))
+
 #elif defined(__sun)
 # pragma init(init)
@@ -125 +132 @@
 # pragma init "init"
 # pragma fini "cleanup"
-
-#elif defined(__GNUC__)
-# undef DEP_INIT_ATTRIBUTE
-# undef DEP_FINI_ATTRIBUTE
-# define DEP_INIT_ATTRIBUTE static __attribute__((constructor))
-# define DEP_FINI_ATTRIBUTE static __attribute__((destructor))
 
 #elif defined(__TANDEM)

@@ -14 +14 @@
 /vendor/openssl/3.0.1:150323-150324
 /vendor/openssl/3.0.2:150728-150729
-/vendor/openssl/current:147554-150727
+/vendor/openssl/3.0.3:151497-151729
+/vendor/openssl/current:147554-151496