Commit f642ebc1 authored by Rich Salz's avatar Rich Salz
Browse files

Undo a9008157 

Undo unapproved commit that removed DJGPP and WATT32
parent 693b71fa

apps/s_client.c

+7 −0
Original line number Diff line number Diff line
@@ -308,6 +308,9 @@ static void sc_usage(void) 
	BIO_printf(bio_err," -prexit       - print session information even on connection failure\n");

	BIO_printf(bio_err," -showcerts    - show all certificates in the chain\n");

	BIO_printf(bio_err," -debug        - extra output\n");

#ifdef WATT32

	BIO_printf(bio_err," -wdebug       - WATT-32 tcp debugging\n");

#endif

	BIO_printf(bio_err," -msg          - Show protocol messages\n");

	BIO_printf(bio_err," -nbio_test    - more ssl protocol testing\n");

	BIO_printf(bio_err," -state        - print the 'ssl' states\n");
@@ -827,6 +830,10 @@ static char *jpake_secret = NULL; 
			c_tlsextdebug=1;

		else if	(strcmp(*argv,"-status") == 0)

			c_status_req=1;

#endif

#ifdef WATT32

		else if (strcmp(*argv,"-wdebug") == 0)

			dbug_init();

#endif

		else if	(strcmp(*argv,"-msg") == 0)

			c_msg=1;

apps/s_server.c

+1 −1
Original line number Diff line number Diff line
@@ -2971,7 +2971,7 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context) 
				BIO_printf(bio_s_out,"read R BLOCK\n");

#if defined(OPENSSL_SYS_NETWARE)

            delay(1000);

#elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__)

#elif !defined(OPENSSL_SYS_MSDOS)

				sleep(1);

#endif

				continue;

apps/s_socket.c

+6 −1
Original line number Diff line number Diff line
@@ -178,7 +178,12 @@ static void sock_cleanup(void) 


static int ssl_sock_init(void)

	{

#if defined(OPENSSL_SYS_WINDOWS)

#ifdef WATT32

	extern int _watt_do_exit;

	_watt_do_exit = 0;

	if (sock_init())

		return (0);

#elif defined(OPENSSL_SYS_WINDOWS)

	if (!wsa_init_done)

		{

		int err;

crypto/bio/b_sock.c

+11 −1
Original line number Diff line number Diff line
@@ -494,6 +494,12 @@ int BIO_sock_init(void) 
			}

		}

#endif /* OPENSSL_SYS_WINDOWS */

#ifdef WATT32

	extern int _watt_do_exit;

	_watt_do_exit = 0;    /* don't make sock_init() call exit() */

	if (sock_init())

		return (-1);

#endif



#if defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)

    WORD wVerReq;
@@ -543,6 +549,9 @@ int BIO_socket_ioctl(int fd, long type, void *arg) 
	{

	int i;



#ifdef __DJGPP__

	i=ioctlsocket(fd,type,(char *)arg);

#else

# if defined(OPENSSL_SYS_VMS)

	/* 2011-02-18 SMS.

	 * VMS ioctl() can't tolerate a 64-bit "void *arg", but we
@@ -565,8 +574,9 @@ int BIO_socket_ioctl(int fd, long type, void *arg) 
# else /* defined(OPENSSL_SYS_VMS) */

#  define ARG arg

# endif /* defined(OPENSSL_SYS_VMS) [else] */

	i=ioctlsocket(fd,type,ARG);



	i=ioctlsocket(fd,type,ARG);

#endif /* __DJGPP__ */

	if (i < 0)

		SYSerr(SYS_F_IOCTLSOCKET,get_last_socket_error());

	return(i);

crypto/bio/bss_dgram.c

+6 −0
Original line number Diff line number Diff line
@@ -95,6 +95,12 @@ 
         ((a)->s6_addr32[2] == htonl(0x0000ffff)))

#endif



#ifdef WATT32

#define sock_write SockWrite  /* Watt-32 uses same names */

#define sock_read  SockRead

#define sock_puts  SockPuts

#endif



static int dgram_write(BIO *h, const char *buf, int num);

static int dgram_read(BIO *h, char *buf, int size);

static int dgram_puts(BIO *h, const char *str);