[openssl-commits] [openssl] OpenSSL source code branch master updated. 5ad4fdce41bb1ce7762b70fb50f732f70e3772cf

[Rich Salz]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSSL source code".

The branch, master has been updated
       via  5ad4fdce41bb1ce7762b70fb50f732f70e3772cf (commit)
      from  67472bd82bed9d5e481b0d75926aab93618902be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5ad4fdce41bb1ce7762b70fb50f732f70e3772cf
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Dec 22 17:47:28 2014 -0500

    RT3548: Remove unsupported platforms.
    
    This commit removes MPE/iX
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES               |    1 +
 apps/s_socket.c       |    2 +-
 crypto/bio/bss_conn.c |    2 +-
 crypto/des/read_pwd.c |    6 ------
 e_os.h                |    5 -----
 e_os2.h               |    3 ---
 6 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index a8f37be..4d27975 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 e83baf4..7edef15 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 91e47e9..d2c9695 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 ffc458a..9ad8f51 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 23daaf1..ec011c8 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 7850169..dc6ee2d 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


hooks/post-receive
-- 
OpenSSL source code