The branch master has been updated
via 6b1428ac12749f7ff0e49be363e9f7097f0e58b0 (commit)
from 434343f896a2bb3e5857cc9831c38f8cd1cceec1 (commit)
- Log -----------------------------------------------------------------
commit 6b1428ac12749f7ff0e49be363e9f7097f0e58b0
Author: Randall S. Becker <rsbec...@nexbridge.com>
Date: Sun Sep 20 16:30:14 2020 -0600
Added FIPS DEP initialization for the NonStop platform in fips/self_test.c.
CLA: Permission is granted by the author to the OpenSSL team to use these
modifications.
Fixes #12918
Signed-off-by: Randall S. Becker <rsbec...@nexbridge.com>
Reviewed-by: Paul Dale <paul.d...@oracle.com>
Reviewed-by: Richard Levitte <levi...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12928)
-----------------------------------------------------------------------
Summary of changes:
providers/fips/self_test.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c
index 9d95f0ccf1..81f475e900 100644
--- a/providers/fips/self_test.c
+++ b/providers/fips/self_test.c
@@ -123,6 +123,22 @@ DEP_DECLARE()
#elif defined(__GNUC__)
# define DEP_INIT_ATTRIBUTE static __attribute__((constructor))
# define DEP_FINI_ATTRIBUTE static __attribute__((destructor))
+
+#elif defined(__TANDEM)
+DEP_DECLARE() /* must be declared before calling init() or cleanup() */
+# define DEP_INIT_ATTRIBUTE
+# define DEP_FINI_ATTRIBUTE
+
+/* Method automatically called by the NonStop OS when the DLL loads */
+void __INIT__init(void) {
+ init();
+}
+
+/* Method automatically called by the NonStop OS prior to unloading the DLL */
+void __TERM__cleanup(void) {
+ cleanup();
+}
+
#endif
#if defined(DEP_INIT_ATTRIBUTE) && defined(DEP_FINI_ATTRIBUTE)
