Commit 4700aea9 authored by Ulf Möller's avatar Ulf Möller
Browse files

Add BeOS support. 

PR: 1312
Submitted by: Oliver Tappe <zooey@hirschkaefer.de>
Reviewed by: Ulf Moeller
parent 60cdb821

CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 


 Changes between 0.9.8a and 0.9.9  [xx XXX xxxx]



  *) BeOS support.

     [Oliver Tappe <zooey@hirschkaefer.de>]



  *) New make target "install_html_docs" installs HTML renditions of the

     manual pages.

     [Oliver Tappe <zooey@hirschkaefer.de>]



  *) New utility "genpkey" this is analagous to "genrsa" etc except it can

     generate keys for any algorithm. Extend and update EVP_PKEY_METHOD to

     support key and parameter generation and add initial key generation

Configure

+4 −0
Original line number Diff line number Diff line
@@ -381,6 +381,10 @@ my %table=( 
"qnx4",	"cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:",

"qnx6",	"cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",



# BeOS

"beos-x86-r5",   "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so",

"beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so",



#### SCO/Caldera targets.

#

# Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc.

Makefile.shared

+16 −1
Original line number Diff line number Diff line
@@ -170,6 +170,17 @@ link_a.gnu: 
link_app.gnu:

	@ $(DO_GNU_APP); $(LINK_APP)



DO_BEOS_SO=	SHLIB=lib$(LIBNAME).so; \

	SHLIB_SUFFIX=; \

	ALLSYMSFLAGS='-Wl,--whole-archive'; \

	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SUFFIX"



link_o.beos:

	@ $(DO_BEOS_SO); $(LINK_SO_O)

link_a.beos:

	@ $(DO_BEOS_SO); $(LINK_SO_A)



link_o.bsd:

	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \

	$(CALC_VERSIONS); \
@@ -543,7 +554,7 @@ symlink.hpux: 
	expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \

	$(SYMLINK_SO)

# The following lines means those specific architectures do no symlinks

symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:

symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:



# Compatibility targets

link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
@@ -601,3 +612,7 @@ link_o.reliantunix-shared: link_o.reliantunix 
link_a.reliantunix-shared: link_a.reliantunix

link_app.reliantunix-shared: link_app.reliantunix

symlink.reliantunix-shared: symlink.reliantunix

link_o.beos-shared: link_o.beos

link_a.beos-shared: link_a.beos

link_app.beos-shared: link_app.gnu

symlink.beos-shared: symlink.beos

apps/s_client.c

+32 −4
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ 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
@@ -379,8 +383,11 @@ int MAIN(int argc, char **argv) 
	char *engine_id=NULL;

	ENGINE *e=NULL;

#endif

#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)

#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)

	struct timeval tv;

#if defined(OPENSSL_SYS_BEOS_R5)

	int stdin_set = 0;

#endif

#endif



#ifndef OPENSSL_NO_TLSEXT
@@ -949,7 +956,7 @@ re_start: 


		if (!ssl_pending)

			{

#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE)

#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) && !defined (OPENSSL_SYS_BEOS_R5)

			if (tty_on)

				{

				if (read_tty)  FD_SET(fileno(stdin),&readfds);
@@ -1009,6 +1016,25 @@ re_start: 
				} else 	i=select(width,(void *)&readfds,(void *)&writefds,

					NULL,NULL);

			}

#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,NULL);

			}

			(void)fcntl(fileno(stdin), F_SETFL, 0);

#else

			i=select(width,(void *)&readfds,(void *)&writefds,

				 NULL,NULL);
@@ -1089,8 +1115,8 @@ re_start: 
				goto shut;

				}

			}

#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)

		/* Assume Windows/DOS can always write */

#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)

		/* Assume Windows/DOS/BeOS can always write */

		else if (!ssl_pending && write_tty)

#else

		else if (!ssl_pending && FD_ISSET(fileno(stdout),&writefds))
@@ -1178,6 +1204,8 @@ 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

+17 −2
Original line number Diff line number Diff line
@@ -193,6 +193,10 @@ 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
@@ -1511,7 +1515,7 @@ static int sv_body(char *hostname, int s, unsigned char *context) 
	unsigned long l;

	SSL *con=NULL;

	BIO *sbio;

#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)

#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)

	struct timeval tv;

#endif
@@ -1616,7 +1620,7 @@ static int sv_body(char *hostname, int s, unsigned char *context) 
		if (!read_from_sslcon)

			{

			FD_ZERO(&readfds);

#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE)

#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) && !defined(OPENSSL_SYS_BEOS_R5)

			FD_SET(fileno(stdin),&readfds);

#endif

			FD_SET(s,&readfds);
@@ -1638,6 +1642,17 @@ static int sv_body(char *hostname, int s, 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

			i=select(width,(void *)&readfds,NULL,NULL,NULL);

			if (i <= 0) continue;