OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
17-Apr-2006 14:22:14
Branch: HEAD Handle:
2006041713221300
Modified files:
openssl/apps apps.h s_client.c s_server.c
s_time.c
Log:
If we include winsock2.h then FD_SET wants an unsigned
type for an fd.
Summary:
Revision Changes Path
1.78 +7 -0 openssl/apps/apps.h
1.95 +6 -6 openssl/apps/s_client.c
1.115 +2 -2 openssl/apps/s_server.c
1.34 +1 -1 openssl/apps/s_time.c
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/apps/apps.h
============================================================
================
$ cvs diff -u -r1.77 -r1.78 apps.h
--- openssl/apps/apps.h 9 Apr 2006 12:42:07 -0000 1.77
+++ openssl/apps/apps.h 17 Apr 2006 12:22:13 -0000 1.78
-193,6 +193,13
# 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;
.
patch -p0 <<' .'
Index: openssl/apps/s_client.c
============================================================
================
$ cvs diff -u -r1.94 -r1.95 s_client.c
--- openssl/apps/s_client.c 11 Apr 2006 21:34:14
-0000 1.94
+++ openssl/apps/s_client.c 17 Apr 2006 12:22:13
-0000 1.95
-959,19 +959,19
#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",
.
patch -p0 <<' .'
Index: openssl/apps/s_server.c
============================================================
================
$ cvs diff -u -r1.114 -r1.115 s_server.c
--- openssl/apps/s_server.c 11 Apr 2006 21:34:15
-0000 1.114
+++ openssl/apps/s_server.c 17 Apr 2006 12:22:13
-0000 1.115
-1621,9 +1621,9
{
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
.
patch -p0 <<' .'
Index: openssl/apps/s_time.c
============================================================
================
$ cvs diff -u -r1.33 -r1.34 s_time.c
--- openssl/apps/s_time.c 6 Nov 2005 11:40:59 -0000 1.33
+++ openssl/apps/s_time.c 17 Apr 2006 12:22:13 -0000 1.34
-601,7 +601,7
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
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|