From: jsing <jsing@openbsd.org>
Date: Tue, 22 Apr 2014 14:54:13 +0000 (+0000)
Subject: Nuke the last of the windows related defines from the openssl apps.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=25d81b19eee099d750c4bd2c0b1b14a7bf77bb7f;p=openbsd

Nuke the last of the windows related defines from the openssl apps.

ok deraadt@
---

diff --git a/lib/libssl/src/apps/apps.c b/lib/libssl/src/apps/apps.c
index 675d8261ecb..d2fc72f6b89 100644
--- a/lib/libssl/src/apps/apps.c
+++ b/lib/libssl/src/apps/apps.c
@@ -502,14 +502,6 @@ app_get_pass(BIO * err, char *arg, int keepbio)
 				    arg + 5);
 				return NULL;
 			}
-			/*
-			 * Under _WIN32, which covers even Win64 and CE, file
-			 * descriptors referenced by BIO_s_fd are not inherited
-			 * by child process and therefore below is not an option.
-			 * It could have been an option if bss_fd.c was operating
-			 * on real Windows descriptors, such as those obtained
-			 * with CreateFile.
-			 */
 		} else if (!strncmp(arg, "fd:", 3)) {
 			BIO *btmp;
 			i = atoi(arg + 3);
diff --git a/lib/libssl/src/apps/ciphers.c b/lib/libssl/src/apps/ciphers.c
index ef2da82507b..e9712bc2c5d 100644
--- a/lib/libssl/src/apps/ciphers.c
+++ b/lib/libssl/src/apps/ciphers.c
@@ -59,9 +59,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 #include "apps.h"
 #include <openssl/err.h>
 #include <openssl/ssl.h>
diff --git a/lib/libssl/src/apps/engine.c b/lib/libssl/src/apps/engine.c
index 7898c96f23d..648d465cffd 100644
--- a/lib/libssl/src/apps/engine.c
+++ b/lib/libssl/src/apps/engine.c
@@ -60,9 +60,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 #include "apps.h"
 #include <openssl/err.h>
 #ifndef OPENSSL_NO_ENGINE
diff --git a/lib/libssl/src/apps/req.c b/lib/libssl/src/apps/req.c
index 8fac59231f4..a4a3414b95e 100644
--- a/lib/libssl/src/apps/req.c
+++ b/lib/libssl/src/apps/req.c
@@ -66,9 +66,6 @@
 #include <stdlib.h>
 #include <time.h>
 #include <string.h>
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/evp.h>
diff --git a/lib/libssl/src/apps/s_client.c b/lib/libssl/src/apps/s_client.c
index 94f02e8d5a4..871e6966d54 100644
--- a/lib/libssl/src/apps/s_client.c
+++ b/lib/libssl/src/apps/s_client.c
@@ -148,9 +148,6 @@
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 
 #include "apps.h"
 #include <openssl/x509.h>
diff --git a/lib/libssl/src/apps/s_server.c b/lib/libssl/src/apps/s_server.c
index b5c6c2fa7bc..b6eb1637529 100644
--- a/lib/libssl/src/apps/s_server.c
+++ b/lib/libssl/src/apps/s_server.c
@@ -155,9 +155,6 @@
 #include <sys/socket.h>
 
 #include <openssl/e_os2.h>
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 
 #include <sys/types.h>
 
diff --git a/lib/libssl/src/apps/s_time.c b/lib/libssl/src/apps/s_time.c
index d8f7294c1e5..a532a3f385c 100644
--- a/lib/libssl/src/apps/s_time.c
+++ b/lib/libssl/src/apps/s_time.c
@@ -69,18 +69,11 @@
 #include <sys/socket.h>
 
 #include "apps.h"
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
 #include <openssl/pem.h>
 #include "s_apps.h"
 #include <openssl/err.h>
-#ifdef WIN32_STUFF
-#include "winmain.h"
-#include "wintext.h"
-#endif
 #include <unistd.h>
 
 
@@ -385,15 +378,6 @@ s_time_main(int argc, char **argv)
 	for (;;) {
 		if (finishtime < (long) time(NULL))
 			break;
-#ifdef WIN32_STUFF
-
-		if (flushWinMsgs(0) == -1)
-			goto end;
-
-		if (waitingToDie || exitNow)	/* we're dead */
-			goto end;
-#endif
-
 		if ((scon = doConnection(NULL)) == NULL)
 			goto end;
 
@@ -487,15 +471,6 @@ next:
 	for (;;) {
 		if (finishtime < (long) time(NULL))
 			break;
-
-#ifdef WIN32_STUFF
-		if (flushWinMsgs(0) == -1)
-			goto end;
-
-		if (waitingToDie || exitNow)	/* we're dead */
-			goto end;
-#endif
-
 		if ((doConnection(scon)) == NULL)
 			goto end;
 
diff --git a/lib/libssl/src/apps/speed.c b/lib/libssl/src/apps/speed.c
index f1bf2261365..ea9a0fd6c3f 100644
--- a/lib/libssl/src/apps/speed.c
+++ b/lib/libssl/src/apps/speed.c
@@ -90,9 +90,6 @@
 #include <string.h>
 #include <math.h>
 #include "apps.h"
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
@@ -102,18 +99,6 @@
 
 #include <signal.h>
 
-#if defined(_WIN32) || defined(__CYGWIN__)
-#include <windows.h>
-#if defined(__CYGWIN__) && !defined(_WIN32)
- /*
-  * <windows.h> should define _WIN32, which normally is mutually exclusive
-  * with __CYGWIN__, but if it didn't...
-  */
-#define _WIN32
- /* this is done because Cygwin alarm() fails sometimes. */
-#endif
-#endif
-
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_DES
 #include <openssl/des.h>
diff --git a/lib/libssl/src/apps/x509.c b/lib/libssl/src/apps/x509.c
index f714b818ea4..319f288c31c 100644
--- a/lib/libssl/src/apps/x509.c
+++ b/lib/libssl/src/apps/x509.c
@@ -60,9 +60,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/asn1.h>