Browse Source

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)

(cherry picked from commit 0339382abad578ccb3989799ea2fb99dfb2d099b)
Randall S. Becker 5 months ago
parent
commit
aee4db38b7
9 changed files with 3 additions and 59 deletions
  1. 1 3
      NOTES-NONSTOP.md
  2. 0 15
      apps/lib/apps.c
  3. 0 6
      apps/lib/http_server.c
  4. 0 6
      apps/lib/s_socket.c
  5. 0 6
      apps/ocsp.c
  6. 0 6
      apps/speed.c
  7. 0 3
      crypto/bio/bio_sock.c
  8. 2 8
      include/internal/sockets.h
  9. 0 6
      test/drbgtest.c

+ 1 - 3
NOTES-NONSTOP.md

@@ -19,9 +19,7 @@ About c99 compiler
 
 
 The c99 compiler is required for building OpenSSL from source. While c11
 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
 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
 Threading Models
 ----------------
 ----------------

+ 0 - 15
apps/lib/apps.c

@@ -2952,11 +2952,6 @@ int raw_read_stdin(void *buf, int siz)
     return recv(fileno_stdin(), buf, siz, 0);
     return recv(fileno_stdin(), buf, siz, 0);
 }
 }
 #else
 #else
-# if defined(__TANDEM)
-#  if defined(OPENSSL_TANDEM_FLOSS)
-#   include <floss.h(floss_read)>
-#  endif
-# endif
 int raw_read_stdin(void *buf, int siz)
 int raw_read_stdin(void *buf, int siz)
 {
 {
     return read(fileno_stdin(), buf, 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) \
 #elif defined(OPENSSL_SYS_TANDEM) && defined(OPENSSL_THREADS) \
     && defined(_SPT_MODEL_)
     && 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)
 int raw_write_stdout(const void *buf, int siz)
 {
 {
     return write(fileno(stdout), (void *)buf, siz);
     return write(fileno(stdout), (void *)buf, siz);
 }
 }
 #else
 #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)
 int raw_write_stdout(const void *buf, int siz)
 {
 {
     return write(fileno_stdout(), buf, siz);
     return write(fileno_stdout(), buf, siz);

+ 0 - 6
apps/lib/http_server.c

@@ -26,12 +26,6 @@
 #include "s_apps.h"
 #include "s_apps.h"
 #include "log.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_PREFIX "HTTP/"
 #define HTTP_VERSION_PATT "1." /* allow 1.x */
 #define HTTP_VERSION_PATT "1." /* allow 1.x */
 #define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT
 #define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT

+ 0 - 6
apps/lib/s_socket.c

@@ -41,12 +41,6 @@ typedef unsigned int u_int;
 # include "s_apps.h"
 # include "s_apps.h"
 # include "internal/sockets.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/bio.h>
 # include <openssl/err.h>
 # include <openssl/err.h>
 
 

+ 0 - 6
apps/ocsp.c

@@ -33,12 +33,6 @@
 #include <openssl/bn.h>
 #include <openssl/bn.h>
 #include <openssl/x509v3.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)
 #if defined(OPENSSL_SYS_VXWORKS)
 /* not supported */
 /* not supported */
 int setpgid(pid_t pid, pid_t pgid)
 int setpgid(pid_t pid, pid_t pgid)

+ 0 - 6
apps/speed.c

@@ -47,12 +47,6 @@
 # include <unistd.h>
 # include <unistd.h>
 #endif
 #endif
 
 
-#if defined(__TANDEM)
-# if defined(OPENSSL_TANDEM_FLOSS)
-#  include <floss.h(floss_fork)>
-# endif
-#endif
-
 #if defined(_WIN32)
 #if defined(_WIN32)
 # include <windows.h>
 # include <windows.h>
 /*
 /*

+ 0 - 3
crypto/bio/bio_sock.c

@@ -26,9 +26,6 @@ static int wsa_init_done = 0;
 # if defined __TANDEM
 # if defined __TANDEM
 #  include <unistd.h>
 #  include <unistd.h>
 #  include <sys/time.h> /* select */
 #  include <sys/time.h> /* select */
-#  if defined(OPENSSL_TANDEM_FLOSS)
-#   include <floss.h(floss_select)>
-#  endif
 # elif defined _WIN32
 # elif defined _WIN32
 #  include <winsock.h> /* for type fd_set */
 #  include <winsock.h> /* for type fd_set */
 # else
 # else

+ 2 - 8
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 readsocket(s,b,n)           read((s),(b),(n))
 #  define writesocket(s,b,n)          write((s),(char *)(b),(n))
 #  define writesocket(s,b,n)          write((s),(char *)(b),(n))
 # elif defined(OPENSSL_SYS_TANDEM)
 # 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 ioctlsocket(a,b,c)      ioctl(a,b,c)
 #  define closesocket(s)          close(s)
 #  define closesocket(s)          close(s)
 # else
 # else

+ 0 - 6
test/drbgtest.c

@@ -28,12 +28,6 @@
 # include <windows.h>
 # include <windows.h>
 #endif
 #endif
 
 
-#if defined(__TANDEM)
-# if defined(OPENSSL_TANDEM_FLOSS)
-#  include <floss.h(floss_fork)>
-# endif
-#endif
-
 #if defined(OPENSSL_SYS_UNIX)
 #if defined(OPENSSL_SYS_UNIX)
 # include <sys/types.h>
 # include <sys/types.h>
 # include <sys/wait.h>
 # include <sys/wait.h>