From: Rich Salz <rsalz@openssl.org>
Date: Mon, 22 Dec 2014 22:47:28 +0000 (-0500)
Subject: RT3548: Remove unsupported platforms.
X-Git-Tag: master-post-reformat~118
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fopenssl.git;a=commitdiff_plain;h=5ad4fdce41bb1ce7762b70fb50f732f70e3772cf

RT3548: Remove unsupported platforms.

This commit removes MPE/iX

Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/CHANGES b/CHANGES
index a8f37bef01..4d27975da6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,6 +31,7 @@
 	BEOS and BEOS_R5
 	NeXT
 	SUNOS
+	MPE/iX
      [Rich Salz]
 
   *) Experimental support for a new, fast, unbiased prime candidate generator,
diff --git a/apps/s_socket.c b/apps/s_socket.c
index e83baf4e70..7edef15c40 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -269,7 +269,7 @@ static int init_client_ip(int *sock, const unsigned char ip[4], int port,
 			
 	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
 
-#if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE)
+#if defined(SO_KEEPALIVE)
 	if (type == SOCK_STREAM)
 		{
 		i=0;
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 91e47e92eb..d2c9695b70 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -236,7 +236,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
 				}
 			c->state=BIO_CONN_S_CONNECT;
 
-#if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE)
+#if defined(SO_KEEPALIVE)
 			i=1;
 			i=setsockopt(b->num,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
 			if (i < 0)
diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c
index ffc458a9c6..9ad8f51f2d 100644
--- a/crypto/des/read_pwd.c
+++ b/crypto/des/read_pwd.c
@@ -289,9 +289,7 @@ int des_read_pw(char *buf, char *buff, int size, const char *prompt,
 #elif defined(OPENSSL_SYS_VXWORKS)
 	tty=stdin;
 #else
-#ifndef OPENSSL_SYS_MPE
 	if ((tty=fopen("/dev/tty","r")) == NULL)
-#endif
 		tty=stdin;
 #endif
 
@@ -332,12 +330,8 @@ int des_read_pw(char *buf, char *buff, int size, const char *prompt,
 
 #if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
 	if (is_a_tty && (TTY_set(fileno(tty),&tty_new) == -1))
-#ifdef OPENSSL_SYS_MPE 
-		; /* MPE lies -- echo really has been disabled */
-#else
 		return(-1);
 #endif
-#endif
 #ifdef OPENSSL_SYS_VMS
 	tty_new[0] = tty_orig[0];
 	tty_new[1] = tty_orig[1] | TT$M_NOECHO;
diff --git a/e_os.h b/e_os.h
index 23daaf1a7d..ec011c8ceb 100644
--- a/e_os.h
+++ b/e_os.h
@@ -421,9 +421,6 @@ static __inline unsigned int _strlen31(const char *str)
 
 #  else
      /* !defined VMS */
-#    ifdef OPENSSL_SYS_MPE
-#      define NO_SYS_PARAM_H
-#    endif
 #    ifdef OPENSSL_UNISTD
 #      include OPENSSL_UNISTD
 #    else
@@ -527,8 +524,6 @@ static __inline unsigned int _strlen31(const char *str)
 #    endif
 #    ifdef OPENSSL_SYS_VXWORKS
 #      include <time.h> 
-#    elif !defined(OPENSSL_SYS_MPE)
-#      include <sys/time.h> /* Needed under linux for FD_XXX */
 #    endif
 
 #    include <netdb.h>
diff --git a/e_os2.h b/e_os2.h
index 7850169dbe..dc6ee2d104 100644
--- a/e_os2.h
+++ b/e_os2.h
@@ -156,9 +156,6 @@ extern "C" {
 # if defined(linux) || defined(__linux__) || defined(OPENSSL_SYSNAME_LINUX)
 #  define OPENSSL_SYS_LINUX
 # endif
-# ifdef OPENSSL_SYSNAME_MPE
-#  define OPENSSL_SYS_MPE
-# endif
 # ifdef OPENSSL_SYSNAME_SNI
 #  define OPENSSL_SYS_SNI
 # endif