VMS support bug fixes. (75e0770d) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/s_client.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -79,8 +79,8 @@ typedef unsigned int u_int;
	#include <openssl/pem.h>		#include <openssl/pem.h>
	#include "s_apps.h"		#include "s_apps.h"

	#if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl,		#if (defined(VMS) && __VMS_VER < 70000000)
	and that isn't in VMS < 7.0 */		/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
	#undef FIONBIO		#undef FIONBIO
	#endif		#endif

	@@ -468,7 +468,7 @@ re_start:
	/* printf("mode tty(%d %d%d) ssl(%d%d)\n",		/* printf("mode tty(%d %d%d) ssl(%d%d)\n",
	tty_on,read_tty,write_tty,read_ssl,write_ssl);*/		tty_on,read_tty,write_tty,read_ssl,write_ssl);*/

	/* Note: under VMS with SOCKETSHR the third parameter		/* Note: under VMS with SOCKETSHR the second 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
	* will choke the compiler: if you do have a cast then		* will choke the compiler: if you do have a cast then

apps/s_server.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -83,8 +83,8 @@ typedef unsigned int u_int;
	#include <openssl/ssl.h>		#include <openssl/ssl.h>
	#include "s_apps.h"		#include "s_apps.h"

	#if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl,		#if (defined(VMS) && __VMS_VER < 70000000)
	and that isn't in VMS < 7.0 */		/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
	#undef FIONBIO		#undef FIONBIO
	#endif		#endif

	@@ -628,7 +628,7 @@ static int sv_body(char hostname, int s, unsigned char context)
	FD_SET(fileno(stdin),&readfds);		FD_SET(fileno(stdin),&readfds);
	#endif		#endif
	FD_SET(s,&readfds);		FD_SET(s,&readfds);
	/* Note: under VMS with SOCKETSHR the third 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
	* the compiler: if you do have a cast then you can either		* the compiler: if you do have a cast then you can either

apps/s_socket.c

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -78,12 +78,12 @@ typedef unsigned int u_int;
	#include "s_apps.h"		#include "s_apps.h"
	#include <openssl/ssl.h>		#include <openssl/ssl.h>

			#ifdef VMS
	#if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl,		#if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl,
	and that isn't in VMS < 7.0 */		and that isn't in VMS < 7.0 */
	#undef FIONBIO		#undef FIONBIO
	#endif		#endif
	#ifdef VMS /* for vfork() */		#include <processes.h> /* for vfork() */
	#include <processes.h>
	#endif		#endif

	static struct hostent GetHostByName(char name);		static struct hostent GetHostByName(char name);
	@@ -255,7 +255,9 @@ int nbio_init_client_ip(int *sock, unsigned char ip[4], int port)

	if (*sock <= 0)		if (*sock <= 0)
	{		{
			#ifdef FIONBIO
	unsigned long l=1;		unsigned long l=1;
			#endif

	s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);		s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
	if (s == INVALID_SOCKET) { perror("socket"); return(0); }		if (s == INVALID_SOCKET) { perror("socket"); return(0); }
	@@ -387,7 +389,7 @@ redoit:

	memset((char *)&from,0,sizeof(from));		memset((char *)&from,0,sizeof(from));
	len=sizeof(from);		len=sizeof(from);
	/* Note: under VMS with SOCKETSHR the third parameter is currently		/* Note: under VMS with SOCKETSHR the fourth parameter is currently
	* of type (int ) whereas under other systems it is (void ) if		* of type (int ) whereas under other systems it is (void ) if
	* you don't have a cast it will choke the compiler: if you do		* you don't have a cast it will choke the compiler: if you do
	* have a cast then you can either go for (int ) or (void ).		* have a cast then you can either go for (int ) or (void ).

apps/s_time.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -668,7 +668,7 @@ static SSL doConnection(SSL scon)
	width=i+1;		width=i+1;
	FD_ZERO(&readfds);		FD_ZERO(&readfds);
	FD_SET(i,&readfds);		FD_SET(i,&readfds);
	/* Note: under VMS with SOCKETSHR the third 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
	* will choke the compiler: if you do have a cast then		* will choke the compiler: if you do have a cast then

crypto/bio/b_sock.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -596,7 +596,7 @@ int BIO_accept(int sock, char **addr)

	memset((char *)&from,0,sizeof(from));		memset((char *)&from,0,sizeof(from));
	len=sizeof(from);		len=sizeof(from);
	/* Note: under VMS with SOCKETSHR the third parameter is currently		/* Note: under VMS with SOCKETSHR the fourth parameter is currently
	* of type (int ) whereas under other systems it is (void ) if		* of type (int ) whereas under other systems it is (void ) if
	* you don't have a cast it will choke the compiler: if you do		* you don't have a cast it will choke the compiler: if you do
	* have a cast then you can either go for (int ) or (void ).		* have a cast then you can either go for (int ) or (void ).