Remove all references to FLOSS for NonStop Builds.

FLOSS is no longer a dependency for NonStop as of the deprecation of the SPT
thread model builds.

Fixes: #24214
Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24217)

diff --git a/NOTES-NONSTOP.md b/NOTES-NONSTOP.md
index 6cf12042d53af9bcf5e13580cdb53eb79586738d..09085967de68feba2781b5c2c15c5aace2506e3d 100644 (file)
--- a/NOTES-NONSTOP.md
+++ b/NOTES-NONSTOP.md
@@ -19,9 +19,7 @@ About c99 compiler
 
 The c99 compiler is required for building OpenSSL from source. While c11
 may work, it has not been broadly tested. c99 is the only compiler
-prerequisite needed to build OpenSSL 3.0 on this platform. You should also
-have the FLOSS package installed on your system. The ITUGLIB FLOSS package
-is the only FLOSS variant that has been broadly tested.
+prerequisite needed to build OpenSSL 3.0 on this platform.
 
 Threading Models
 ----------------

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index c87f0f02f1f1d6f3087fb44542e2afd624d5d5f0..619fd077129d6b0d161055bf0160ef96d9d81665 100644 (file)
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -2952,11 +2952,6 @@ int raw_read_stdin(void *buf, int siz)
     return recv(fileno_stdin(), buf, siz, 0);
 }
 #else
-# if defined(__TANDEM)
-#  if defined(OPENSSL_TANDEM_FLOSS)
-#   include <floss.h(floss_read)>
-#  endif
-# endif
 int raw_read_stdin(void *buf, int siz)
 {
     return read(fileno_stdin(), buf, siz);
@@ -2975,21 +2970,11 @@ int raw_write_stdout(const void *buf, int siz)
 }
 #elif defined(OPENSSL_SYS_TANDEM) && defined(OPENSSL_THREADS) \
     && defined(_SPT_MODEL_)
-# if defined(__TANDEM)
-#  if defined(OPENSSL_TANDEM_FLOSS)
-#   include <floss.h(floss_write)>
-#  endif
-# endif
 int raw_write_stdout(const void *buf, int siz)
 {
     return write(fileno(stdout), (void *)buf, siz);
 }
 #else
-# if defined(__TANDEM)
-#  if defined(OPENSSL_TANDEM_FLOSS)
-#   include <floss.h(floss_write)>
-#  endif
-# endif
 int raw_write_stdout(const void *buf, int siz)
 {
     return write(fileno_stdout(), buf, siz);

diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c
index 0bdeaeb5f7416bd6494b025537d95832a2bfb9e3..8a8c8897d33c23d5621c07f31135119dd6dc6375 100644 (file)
--- a/apps/lib/http_server.c
+++ b/apps/lib/http_server.c
@@ -26,12 +26,6 @@
 #include "s_apps.h"
 #include "log.h"
 
-#if defined(__TANDEM)
-# if defined(OPENSSL_TANDEM_FLOSS)
-#  include <floss.h(floss_fork)>
-# endif
-#endif
-
 #define HTTP_PREFIX "HTTP/"
 #define HTTP_VERSION_PATT "1." /* allow 1.x */
 #define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT

diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c
index ace51686addc4f1b2ee263cfa58510a08ee99d29..46c002822325ce75e12bcba81f077160ff1cfe15 100644 (file)
--- a/apps/lib/s_socket.c
+++ b/apps/lib/s_socket.c
@@ -41,12 +41,6 @@ typedef unsigned int u_int;
 # include "s_apps.h"
 # include "internal/sockets.h"
 
-# if defined(__TANDEM)
-#  if defined(OPENSSL_TANDEM_FLOSS)
-#   include <floss.h(floss_read)>
-#  endif
-# endif
-
 # include <openssl/bio.h>
 # include <openssl/err.h>
 

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 17313520cf858630b817bb543951b6d21d9bfbb3..4b682dca92f8cca42256267aeab8cd598eb63617 100644 (file)
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -33,12 +33,6 @@
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
 
-#if defined(__TANDEM)
-# if defined(OPENSSL_TANDEM_FLOSS)
-#  include <floss.h(floss_fork)>
-# endif
-#endif
-
 #if defined(OPENSSL_SYS_VXWORKS)
 /* not supported */
 int setpgid(pid_t pid, pid_t pgid)

diff --git a/apps/speed.c b/apps/speed.c
index 5a985bf7a4ff50072b904ccf5258e276010ebfef..a119a52fde9b45cb9465c5cf20f0e832419c365b 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -47,12 +47,6 @@
 # include <unistd.h>
 #endif
 
-#if defined(__TANDEM)
-# if defined(OPENSSL_TANDEM_FLOSS)
-#  include <floss.h(floss_fork)>
-# endif
-#endif
-
 #if defined(_WIN32)
 # include <windows.h>
 /*

diff --git a/crypto/bio/bio_sock.c b/crypto/bio/bio_sock.c
index 52b11fa8c1d2279399d1b903394265dc391ca0a5..05523b5e5fccfb0716e08ed5a074d87d780d68a1 100644 (file)
--- a/crypto/bio/bio_sock.c
+++ b/crypto/bio/bio_sock.c
@@ -26,9 +26,6 @@ static int wsa_init_done = 0;
 # if defined __TANDEM
 #  include <unistd.h>
 #  include <sys/time.h> /* select */
-#  if defined(OPENSSL_TANDEM_FLOSS)
-#   include <floss.h(floss_select)>
-#  endif
 # elif defined _WIN32
 #  include <winsock.h> /* for type fd_set */
 # else

diff --git a/include/internal/sockets.h b/include/internal/sockets.h
index 2550c56bd0ed9c3c6368667ac3f36c7da3cfa64f..cdead1c1531b8fa86917d5a60678026b4292e951 100644 (file)
--- a/include/internal/sockets.h
+++ b/include/internal/sockets.h
@@ -190,14 +190,8 @@ typedef size_t socklen_t;        /* Currently appears to be missing on VMS */
 #  define readsocket(s,b,n)           read((s),(b),(n))
 #  define writesocket(s,b,n)          write((s),(char *)(b),(n))
 # elif defined(OPENSSL_SYS_TANDEM)
-#  if defined(OPENSSL_TANDEM_FLOSS)
-#   include <floss.h(floss_read, floss_write)>
-#   define readsocket(s,b,n)       floss_read((s),(b),(n))
-#   define writesocket(s,b,n)      floss_write((s),(b),(n))
-#  else
-#   define readsocket(s,b,n)       read((s),(b),(n))
-#   define writesocket(s,b,n)      write((s),(b),(n))
-#  endif
+#  define readsocket(s,b,n)       read((s),(b),(n))
+#  define writesocket(s,b,n)      write((s),(b),(n))
 #  define ioctlsocket(a,b,c)      ioctl(a,b,c)
 #  define closesocket(s)          close(s)
 # else

diff --git a/test/drbgtest.c b/test/drbgtest.c
index 13bc62a4c0db5233968ef77aa603003578c3221f..06f7dc3cd86137dea8e90efcd1d3bf932cddb2a9 100644 (file)
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -28,12 +28,6 @@
 # include <windows.h>
 #endif
 
-#if defined(__TANDEM)
-# if defined(OPENSSL_TANDEM_FLOSS)
-#  include <floss.h(floss_fork)>
-# endif
-#endif
-
 #if defined(OPENSSL_SYS_UNIX)
 # include <sys/types.h>
 # include <sys/wait.h>