Mostly gut e_os.h:

USE_SOCKETS is unrelated to using sockets, but just pulls in .h files.  It
makes every file buy a kitchen sink, because 11 files forgot to.
EXIT() is really exit(), a gentle surprise
but... OPENSSL_EXIT() is really just return(), because noone compiles the
openssl command non-monolithic anymore

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libssl/src/apps/genrsa.c b/src/lib/libssl/src/apps/genrsa.c
index 65e136a8d2..e6e9877cb9 100644
--- a/src/lib/libssl/src/apps/genrsa.c
+++ b/src/lib/libssl/src/apps/genrsa.c
@@ -215,7 +215,7 @@ bad:
 #ifndef OPENSSL_NO_ENGINE
                 BIO_printf(bio_err, " -engine e       use engine e, possibly a hardware device.\n");
 #endif
-                BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+                BIO_printf(bio_err, " -rand file%cfile%c...\n", ':', ':');
                 BIO_printf(bio_err, "                 load the file (or the files in the directory) into\n");
                 BIO_printf(bio_err, "                 the random number generator\n");
                 goto err;
@@ -296,7 +296,7 @@ err:
                 if (ret != 0)
                         ERR_print_errors(bio_err);
         apps_shutdown();
-        OPENSSL_EXIT(ret);
+        return(ret);
 }
 
 static int