Commit 7bf7333d authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

If we include winsock2.h then FD_SET wants an unsigned type for an fd.

parent c20276e4

apps/apps.h

+7 −0
Original line number Diff line number Diff line
@@ -193,6 +193,13 @@ extern BIO *bio_err; 
#  endif

#endif



#ifdef OPENSSL_SYSNAME_WIN32

#  define openssl_fdset(a,b) FD_SET((unsigned int)a, b)

#else

#  define openssl_fdset(a,b) FD_SET(a, b)

#endif





typedef struct args_st

	{

	char **data;

apps/s_client.c

+6 −6
Original line number Diff line number Diff line
@@ -959,19 +959,19 @@ re_start: 
#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);

				if (write_tty) FD_SET(fileno(stdout),&writefds);

				if (read_tty)  openssl_fdset(fileno(stdin),&readfds);

				if (write_tty) openssl_fdset(fileno(stdout),&writefds);

				}

			if (read_ssl)

				FD_SET(SSL_get_fd(con),&readfds);

				openssl_fdset(SSL_get_fd(con),&readfds);

			if (write_ssl)

				FD_SET(SSL_get_fd(con),&writefds);

				openssl_fdset(SSL_get_fd(con),&writefds);

#else

			if(!tty_on || !write_tty) {

				if (read_ssl)

					FD_SET(SSL_get_fd(con),&readfds);

					openssl_fdset(SSL_get_fd(con),&readfds);

				if (write_ssl)

					FD_SET(SSL_get_fd(con),&writefds);

					openssl_fdset(SSL_get_fd(con),&writefds);

			}

#endif

/*			printf("mode tty(%d %d%d) ssl(%d%d)\n",

apps/s_server.c

+2 −2
Original line number Diff line number Diff line
@@ -1621,9 +1621,9 @@ static int sv_body(char *hostname, int s, unsigned char *context) 
			{

			FD_ZERO(&readfds);

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

			FD_SET(fileno(stdin),&readfds);

			openssl_fdset(fileno(stdin),&readfds);

#endif

			FD_SET(s,&readfds);

			openssl_fdset(s,&readfds);

			/* Note: under VMS with SOCKETSHR the second parameter is

			 * currently of type (int *) whereas under other systems

			 * it is (void *) if you don't have a cast it will choke

apps/s_time.c

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ static SSL *doConnection(SSL *scon) 
			i=SSL_get_fd(serverCon);

			width=i+1;

			FD_ZERO(&readfds);

			FD_SET(i,&readfds);

			openssl_fdset(i,&readfds);

			/* Note: under VMS with SOCKETSHR the 2nd parameter

			 * is currently of type (int *) whereas under other

			 * systems it is (void *) if you don't have a cast it