Commit 8d6e6048 authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix to build better with DJGPP. 

PR: 338

Here's the description, submitted by Gisle Vanem <giva@bgnett.no>:

1. sock_init() renamed to ssl_sock_init() in ./apps/s_socket.c due
   to name-clash with Watt-32.

2. rand() renamed to Rand() in ./crypto/bn/divtest.c due to name-clash
   with <stdlib.h>

3. Added calls to dbug_init()/sock_init() in some demo programs.

4. Changed cflags/lflags in configure. Watt-32 install root now taken
   from $WATT_ROOT.
parent 1f309464

Configure

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ my %table=( 
"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:::.dll",



# DJGPP

"DJGPP", "gcc:-I/dev/env/DJDIR/watt32/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/DJDIR/watt32/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::",

"DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::",



# Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at>

"ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown):::::::",

apps/s_client.c

+2 −2
Original line number Diff line number Diff line
@@ -746,8 +746,8 @@ re_start: 
				goto shut;

				}

			}

#ifdef OPENSSL_SYS_WINDOWS

		/* Assume Windows can always write */

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

		/* Assume Windows/DOS can always write */

		else if (!ssl_pending && write_tty)

#else

		else if (!ssl_pending && FD_ISSET(fileno(stdout),&writefds))

apps/s_server.c

+1 −1
Original line number Diff line number Diff line
@@ -1473,7 +1473,7 @@ static int www_body(char *hostname, int s, unsigned char *context) 
			else

				{

				BIO_printf(bio_s_out,"read R BLOCK\n");

#ifndef OPENSSL_SYS_MSDOS

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

				sleep(1);

#endif

				continue;

apps/s_socket.c

+17 −11
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ typedef unsigned int u_int; 


static struct hostent *GetHostByName(char *name);

#ifdef OPENSSL_SYS_WINDOWS

static void sock_cleanup(void);

static void ssl_sock_cleanup(void);

#endif

static int sock_init(void);

static int ssl_sock_init(void);

static int init_client_ip(int *sock,unsigned char ip[4], int port);

static int init_server(int *sock, int port);

static int init_server_long(int *sock, int port,char *ip);
@@ -118,7 +118,7 @@ static LONG FAR PASCAL topHookProc(HWND hwnd, UINT message, WPARAM wParam, 
		case WM_DESTROY:

		case WM_CLOSE:

			SetWindowLong(topWnd,GWL_WNDPROC,(LONG)lpTopWndProc);

			sock_cleanup();

			ssl_sock_cleanup();

			break;

			}

		}
@@ -135,7 +135,7 @@ static BOOL CALLBACK enumproc(HWND hwnd,LPARAM lParam) 
#endif /* OPENSSL_SYS_WINDOWS */



#ifdef OPENSSL_SYS_WINDOWS

static void sock_cleanup(void)

static void ssl_sock_cleanup(void)

	{

	if (wsa_init_done)

		{
@@ -146,15 +146,21 @@ static void sock_cleanup(void) 
	}

#endif



static int sock_init(void)

static int ssl_sock_init(void)

	{

#ifdef OPENSSL_SYS_WINDOWS

#ifdef WATT32

	extern int _watt_do_exit;

	_watt_do_exit = 0;

	dbug_init();

	if (sock_init())

		return (0);

#elif defined(OPENSSL_SYS_WINDOWS)

	if (!wsa_init_done)

		{

		int err;

	  

#ifdef SIGINT

		signal(SIGINT,(void (*)(int))sock_cleanup);

		signal(SIGINT,(void (*)(int))ssl_sock_cleanup);

#endif

		wsa_init_done=1;

		memset(&wsa_state,0,sizeof(wsa_state));
@@ -196,7 +202,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port) 
	struct sockaddr_in them;

	int s,i;



	if (!sock_init()) return(0);

	if (!ssl_sock_init()) return(0);



	memset((char *)&them,0,sizeof(them));

	them.sin_family=AF_INET;
@@ -261,7 +267,7 @@ static int init_server_long(int *sock, int port, char *ip) 
	struct sockaddr_in server;

	int s= -1,i;



	if (!sock_init()) return(0);

	if (!ssl_sock_init()) return(0);



	memset((char *)&server,0,sizeof(server));

	server.sin_family=AF_INET;
@@ -318,7 +324,7 @@ static int do_accept(int acc_sock, int *sock, char **host) 
	int len;

/*	struct linger ling; */



	if (!sock_init()) return(0);

	if (!ssl_sock_init()) return(0);



#ifndef OPENSSL_SYS_WINDOWS

redoit:
@@ -448,7 +454,7 @@ static int host_ip(char *str, unsigned char ip[4]) 
		{ /* do a gethostbyname */

		struct hostent *he;



		if (!sock_init()) return(0);

		if (!ssl_sock_init()) return(0);



		he=GetHostByName(str);

		if (he == NULL)

crypto/bio/b_sock.c

+6 −0
Original line number Diff line number Diff line
@@ -467,6 +467,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

	return(1);

	}