generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dr. Stephen Henson 2006-04-17 12:22:13 +00:00
parent c20276e4ae
commit 7bf7333d68
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/apps.h
View File

@ -193,6 +193,13 @@ extern BIO *bio_err;
# endif # endif
#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 typedef struct args_st
{ {
char **data; char **data;

12
apps/s_client.c
View File

@ -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 !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) && !defined (OPENSSL_SYS_BEOS_R5)
if (tty_on) if (tty_on)
{ {
if (read_tty) FD_SET(fileno(stdin),&readfds); if (read_tty) openssl_fdset(fileno(stdin),&readfds);
if (write_tty) FD_SET(fileno(stdout),&writefds); if (write_tty) openssl_fdset(fileno(stdout),&writefds);
} }
if (read_ssl) if (read_ssl)
FD_SET(SSL_get_fd(con),&readfds); openssl_fdset(SSL_get_fd(con),&readfds);
if (write_ssl) if (write_ssl)
FD_SET(SSL_get_fd(con),&writefds); openssl_fdset(SSL_get_fd(con),&writefds);
#else #else
if(!tty_on || !write_tty) { if(!tty_on || !write_tty) {
if (read_ssl) if (read_ssl)
FD_SET(SSL_get_fd(con),&readfds); openssl_fdset(SSL_get_fd(con),&readfds);
if (write_ssl) if (write_ssl)
FD_SET(SSL_get_fd(con),&writefds); openssl_fdset(SSL_get_fd(con),&writefds);
} }
#endif #endif
/* printf("mode tty(%d %d%d) ssl(%d%d)\n", /* printf("mode tty(%d %d%d) ssl(%d%d)\n",

4
apps/s_server.c
View File

@ -1621,9 +1621,9 @@ static int sv_body(char *hostname, int s, unsigned char *context)
{ {
FD_ZERO(&readfds); 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) && !defined(OPENSSL_SYS_BEOS_R5)
FD_SET(fileno(stdin),&readfds); openssl_fdset(fileno(stdin),&readfds);
#endif #endif
FD_SET(s,&readfds); openssl_fdset(s,&readfds);
/* Note: under VMS with SOCKETSHR the second parameter is /* Note: under VMS with SOCKETSHR the second parameter is
* currently of type (int *) whereas under other systems * currently of type (int *) whereas under other systems
* it is (void *) if you don't have a cast it will choke * it is (void *) if you don't have a cast it will choke

2
apps/s_time.c
View File

@ -601,7 +601,7 @@ static SSL *doConnection(SSL *scon)
i=SSL_get_fd(serverCon); i=SSL_get_fd(serverCon);
width=i+1; width=i+1;
FD_ZERO(&readfds); FD_ZERO(&readfds);
FD_SET(i,&readfds); openssl_fdset(i,&readfds);
/* Note: under VMS with SOCKETSHR the 2nd parameter /* Note: under VMS with SOCKETSHR the 2nd parameter
* is currently of type (int *) whereas under other * is currently of type (int *) whereas under other
* systems it is (void *) if you don't have a cast it * systems it is (void *) if you don't have a cast it