From 0339382abad578ccb3989799ea2fb99dfb2d099b Mon Sep 17 00:00:00 2001 From: "Randall S. Becker" Date: Fri, 19 Apr 2024 22:15:10 +0000 Subject: [PATCH] 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 Reviewed-by: Tom Cosgrove Reviewed-by: Neil Horman Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/24217) --- NOTES-NONSTOP.md | 4 +--- apps/lib/apps.c | 15 --------------- apps/lib/http_server.c | 6 ------ apps/lib/s_socket.c | 6 ------ apps/ocsp.c | 6 ------ apps/speed.c | 6 ------ crypto/bio/bio_sock.c | 3 --- include/internal/sockets.h | 10 ++-------- test/drbgtest.c | 6 ------ 9 files changed, 3 insertions(+), 59 deletions(-) diff --git a/NOTES-NONSTOP.md b/NOTES-NONSTOP.md index 6cf12042d53af..09085967de68f 100644 --- 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 c87f0f02f1f1d..619fd077129d6 100644 --- 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 -# 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 -# 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 -# 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 0bdeaeb5f7416..8a8c8897d33c2 100644 --- 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 -# 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 ace51686addc4..46c002822325c 100644 --- 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 -# endif -# endif - # include # include diff --git a/apps/ocsp.c b/apps/ocsp.c index 17313520cf858..4b682dca92f8c 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -33,12 +33,6 @@ #include #include -#if defined(__TANDEM) -# if defined(OPENSSL_TANDEM_FLOSS) -# include -# 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 5a985bf7a4ff5..a119a52fde9b4 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -47,12 +47,6 @@ # include #endif -#if defined(__TANDEM) -# if defined(OPENSSL_TANDEM_FLOSS) -# include -# endif -#endif - #if defined(_WIN32) # include /* diff --git a/crypto/bio/bio_sock.c b/crypto/bio/bio_sock.c index 52b11fa8c1d22..05523b5e5fccf 100644 --- 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 # include /* select */ -# if defined(OPENSSL_TANDEM_FLOSS) -# include -# endif # elif defined _WIN32 # include /* for type fd_set */ # else diff --git a/include/internal/sockets.h b/include/internal/sockets.h index 2550c56bd0ed9..cdead1c1531b8 100644 --- 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 -# 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 13bc62a4c0db5..06f7dc3cd8613 100644 --- a/test/drbgtest.c +++ b/test/drbgtest.c @@ -28,12 +28,6 @@ # include #endif -#if defined(__TANDEM) -# if defined(OPENSSL_TANDEM_FLOSS) -# include -# endif -#endif - #if defined(OPENSSL_SYS_UNIX) # include # include