Corrected missing definitions from NonStop SPT build.
This change includes swapping the PUT and SPT configuration,
includes of sys/stat.h and sys/types.h in the correct scope
to be picked up by SPT definitions.
Fixes: #14698
Fixes: #14734
CLA: The author has the permission to grant the OpenSSL Team the right to use this change.
Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14736)
diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf
index 5792674..7524c50 100644
--- a/Configurations/50-nonstop.conf
+++ b/Configurations/50-nonstop.conf
@@ -168,13 +168,13 @@
'nonstop-model-put' => {
template => 1,
defines => ['_PUT_MODEL_',
- '_REENTRANT', '_ENABLE_FLOSS_THREADS'],
+ '_REENTRANT', '_THREAD_SUPPORT_FUNCTIONS'],
ex_libs => '-lput',
},
'nonstop-model-spt' => {
template => 1,
defines => ['_SPT_MODEL_',
- '_REENTRANT', '_THREAD_SUPPORT_FUNCTIONS'],
+ '_REENTRANT', '_ENABLE_FLOSS_THREADS'],
ex_libs => '-lspt',
},
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index e840742..bfb7187 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -13,6 +13,8 @@
#include <string.h>
#ifdef __TANDEM
# include <strings.h> /* strcasecmp */
+# include <sys/types.h> /* needed for stat.h */
+# include <sys/stat.h> /* struct stat */
#endif
#include "internal/cryptlib.h"
#include "internal/o_dir.h"
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 655dc71..c3246c4 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -7,6 +7,15 @@
* https://www.openssl.org/source/license.html
*/
+#if defined (__TANDEM) && defined (_SPT_MODEL_)
+/*
+ * These definitions have to come first in SPT due to scoping of the
+ * declarations in c99 associated with SPT use of stat.
+ */
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif
+
#include "internal/cryptlib.h"
#include <errno.h>
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 42524d4..c9cce93 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -127,7 +127,7 @@
# define TTY_set(tty,data) ioctl(tty,TIOCSETP,data)
# endif
-# if !defined(_LIBC) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS)
+# if !defined(_LIBC) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && ! (defined(OPENSSL_SYS_TANDEM) && defined(_SPT_MODEL_))
# include <sys/ioctl.h>
# endif
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index 6c08947..258ad51 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -7,6 +7,15 @@
* https://www.openssl.org/source/license.html
*/
+#if defined (__TANDEM) && defined (_SPT_MODEL_)
+ /*
+ * These definitions have to come first in SPT due to scoping of the
+ * declarations in c99 associated with SPT use of stat.
+ */
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif
+
#include "e_os.h"
#include "internal/cryptlib.h"
#include <stdio.h>
diff --git a/e_os.h b/e_os.h
index 3e7a13f..a4290cf 100644
--- a/e_os.h
+++ b/e_os.h
@@ -297,7 +297,7 @@
/* ----------------------------- HP NonStop -------------------------------- */
/* Required to support platform variant without getpid() and pid_t. */
-# ifdef __TANDEM
+# if defined(__TANDEM) && defined(_GUARDIAN_TARGET)
# include <strings.h>
# include <netdb.h>
# define getservbyname(name,proto) getservbyname((char*)name,proto)
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index fb46657..ea42447 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -217,10 +217,18 @@
ts.tv_sec = (long int) (millis / 1000);
ts.tv_nsec = (long int) (millis % 1000) * 1000000ul;
nanosleep(&ts, NULL);
-# elif defined(__TANDEM) && !defined(_REENTRANT)
-# include <cextdecs.h(PROCESS_DELAY_)>
+# elif defined(__TANDEM)
+# if !defined(_REENTRANT)
+# include <cextdecs.h(PROCESS_DELAY_)>
/* HPNS does not support usleep for non threaded apps */
PROCESS_DELAY_(millis * 1000);
+# elif defined(_SPT_MODEL_)
+# include <spthread.h>
+# include <spt_extensions.h>
+ usleep(millis * 1000);
+# else
+ usleep(millis * 1000);
+# endif
# else
usleep(millis * 1000);
# endif
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 4e4f9aa..cb225b5 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -8,6 +8,10 @@
* https://www.openssl.org/source/license.html
*/
+#if defined(__TANDEM) && defined(_SPT_MODEL_)
+# include <spthread.h>
+# include <spt_extensions.h> /* timeval */
+#endif
#include <stdio.h>
#include <openssl/rand.h>
#include <openssl/engine.h>
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 0ce436d..2f624c0 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -7,6 +7,11 @@
* https://www.openssl.org/source/license.html
*/
+#if defined(__TANDEM) && defined(_SPT_MODEL_)
+# include <spthread.h>
+# include <spt_extensions.h> /* timeval */
+#endif
+
#include <string.h>
#include "internal/nelem.h"
#include "internal/cryptlib.h"
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 74c270d..3b6e78e 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -7,6 +7,11 @@
* https://www.openssl.org/source/license.html
*/
+#if defined(__TANDEM) && defined(_SPT_MODEL_)
+# include <spthread.h>
+# include <spt_extensions.h> /* timeval */
+#endif
+
#include "internal/cryptlib.h"
#include <openssl/rand.h>
#include "../ssl_local.h"
