RT3548: Remove some obsolete platforms (b317819b) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+3 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,9 @@
		done while fixing the error code for the key-too-small case.
		[Annie Yousar <a.yousar@informatik.hu-berlin.de>]

		*) Remove BEOS and BEOS_R5 code.
		[Rich Salz]

		*) Experimental support for a new, fast, unbiased prime candidate generator,
		bn_probable_prime_dh_coprime(). Not currently used by any prime generator.
		[Felix Laurie von Massenbach <felix@erbridge.co.uk>]

apps/s_client.c

+3 −31

Original line number	Diff line number	Diff line
		@@ -174,10 +174,6 @@ typedef unsigned int u_int;
		#undef FIONBIO
		#endif

		#if defined(OPENSSL_SYS_BEOS_R5)
		#include <fcntl.h>
		#endif

		#undef PROG
		#define PROG s_client_main

		@@ -629,11 +625,8 @@ int MAIN(int argc, char **argv)
		ENGINE *ssl_client_engine=NULL;
		#endif
		ENGINE *e=NULL;
		#if defined(OPENSSL_SYS_WINDOWS) \|\| defined(OPENSSL_SYS_MSDOS) \|\| defined(OPENSSL_SYS_NETWARE) \|\| defined(OPENSSL_SYS_BEOS_R5)
		#if defined(OPENSSL_SYS_WINDOWS) \|\| defined(OPENSSL_SYS_MSDOS) \|\| defined(OPENSSL_SYS_NETWARE)
		struct timeval tv;
		#if defined(OPENSSL_SYS_BEOS_R5)
		int stdin_set = 0;
		#endif
		#endif
		#ifndef OPENSSL_NO_TLSEXT
		char *servername = NULL;
		@@ -1806,7 +1799,7 @@ SSL_set_tlsext_status_ids(con, ids);

		if (!ssl_pending)
		{
		#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) && !defined (OPENSSL_SYS_BEOS_R5)
		#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE)
		if (tty_on)
		{
		if (read_tty) openssl_fdset(fileno(stdin),&readfds);
		@@ -1866,25 +1859,6 @@ SSL_set_tlsext_status_ids(con, ids);
		} else i=select(width,(void )&readfds,(void )&writefds,
		NULL,timeoutp);
		}
		#elif defined(OPENSSL_SYS_BEOS_R5)
		/* Under BeOS-R5 the situation is similar to DOS */
		i=0;
		stdin_set = 0;
		(void)fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
		if(!write_tty) {
		if(read_tty) {
		tv.tv_sec = 1;
		tv.tv_usec = 0;
		i=select(width,(void )&readfds,(void )&writefds,
		NULL,&tv);
		if (read(fileno(stdin), sbuf, 0) >= 0)
		stdin_set = 1;
		if (!i && (stdin_set != 1 \|\| !read_tty))
		continue;
		} else i=select(width,(void )&readfds,(void )&writefds,
		NULL,timeoutp);
		}
		(void)fcntl(fileno(stdin), F_SETFL, 0);
		#else
		i=select(width,(void )&readfds,(void )&writefds,
		NULL,timeoutp);
		@@ -1971,7 +1945,7 @@ SSL_set_tlsext_status_ids(con, ids);
		goto shut;
		}
		}
		#if defined(OPENSSL_SYS_WINDOWS) \|\| defined(OPENSSL_SYS_MSDOS) \|\| defined(OPENSSL_SYS_NETWARE) \|\| defined(OPENSSL_SYS_BEOS_R5)
		#if defined(OPENSSL_SYS_WINDOWS) \|\| defined(OPENSSL_SYS_MSDOS) \|\| defined(OPENSSL_SYS_NETWARE)
		/* Assume Windows/DOS/BeOS can always write */
		else if (!ssl_pending && write_tty)
		#else
		@@ -2066,8 +2040,6 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
		#endif
		#elif defined (OPENSSL_SYS_NETWARE)
		else if (_kbhit())
		#elif defined(OPENSSL_SYS_BEOS_R5)
		else if (stdin_set)
		#else
		else if (FD_ISSET(fileno(stdin),&readfds))
		#endif

apps/s_server.c

+2 −17

Original line number	Diff line number	Diff line
		@@ -197,10 +197,6 @@ typedef unsigned int u_int;
		#undef FIONBIO
		#endif

		#if defined(OPENSSL_SYS_BEOS_R5)
		#include <fcntl.h>
		#endif

		#ifndef OPENSSL_NO_RSA
		static RSA MS_CALLBACK tmp_rsa_cb(SSL s, int is_export, int keylength);
		#endif
		@@ -2214,7 +2210,7 @@ static int sv_body(char hostname, int s, int stype, unsigned char context)
		KSSL_CTX *kctx;
		#endif
		struct timeval timeout;
		#if defined(OPENSSL_SYS_WINDOWS) \|\| defined(OPENSSL_SYS_MSDOS) \|\| defined(OPENSSL_SYS_NETWARE) \|\| defined(OPENSSL_SYS_BEOS_R5)
		#if defined(OPENSSL_SYS_WINDOWS) \|\| defined(OPENSSL_SYS_MSDOS) \|\| defined(OPENSSL_SYS_NETWARE)
		struct timeval tv;
		#else
		struct timeval *timeoutp;
		@@ -2368,7 +2364,7 @@ static int sv_body(char hostname, int s, int stype, unsigned char context)
		if (!read_from_sslcon)
		{
		FD_ZERO(&readfds);
		#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) && !defined(OPENSSL_SYS_BEOS_R5)
		#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE)
		openssl_fdset(fileno(stdin),&readfds);
		#endif
		openssl_fdset(s,&readfds);
		@@ -2390,17 +2386,6 @@ static int sv_body(char hostname, int s, int stype, unsigned char context)
		if((i < 0) \|\| (!i && !_kbhit() ) )continue;
		if(_kbhit())
		read_from_terminal = 1;
		#elif defined(OPENSSL_SYS_BEOS_R5)
		/* Under BeOS-R5 the situation is similar to DOS */
		tv.tv_sec = 1;
		tv.tv_usec = 0;
		(void)fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
		i=select(width,(void *)&readfds,NULL,NULL,&tv);
		if ((i < 0) \|\| (!i && read(fileno(stdin), buf, 0) < 0))
		continue;
		if (read(fileno(stdin), buf, 0) >= 0)
		read_from_terminal = 1;
		(void)fcntl(fileno(stdin), F_SETFL, 0);
		#else
		if ((SSL_version(con) == DTLS1_VERSION) &&
		DTLSv1_get_timeout(con, &timeout))

crypto/bio/b_sock.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -235,10 +235,6 @@ int BIO_sock_error(int sock)
		int j,i;
		union { size_t s; int i; } size;

		#if defined(OPENSSL_SYS_BEOS_R5)
		return 0;
		#endif

		/* heuristic way to adapt for platforms that expect 64-bit optlen */
		size.s=0, size.i=sizeof(j);
		/* Note: under Windows the third parameter is of type (char *)

crypto/dso/Makefile

+2 −10

Original line number	Diff line number	Diff line
		@@ -18,9 +18,9 @@ APPS=

		LIB=$(TOP)/libcrypto.a
		LIBSRC= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \
		dso_openssl.c dso_win32.c dso_vms.c dso_beos.c
		dso_openssl.c dso_win32.c dso_vms.c
		LIBOBJ= dso_dl.o dso_dlfcn.o dso_err.o dso_lib.o dso_null.o \
		dso_openssl.o dso_win32.o dso_vms.o dso_beos.o
		dso_openssl.o dso_win32.o dso_vms.o

		SRC= $(LIBSRC)

		@@ -76,14 +76,6 @@ clean:

		# DO NOT DELETE THIS LINE -- make depend depends on it.

		dso_beos.o: ../../e_os.h ../../include/openssl/bio.h
		dso_beos.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
		dso_beos.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
		dso_beos.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
		dso_beos.o: ../../include/openssl/opensslconf.h
		dso_beos.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
		dso_beos.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		dso_beos.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_beos.c
		dso_dl.o: ../../e_os.h ../../include/openssl/bio.h
		dso_dl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
		dso_dl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h

Admin message