Commit 6b7a46b7 authored by Richard Levitte's avatar Richard Levitte
Browse files

Add a few more VxWorks targets. 

Correct misspelled VXWORKS macros.
Add VXWORKS identifying macros to e_os2.h.
Add required inclusions and mappings for VxWorks in e_os.h.
A few small modifications to make OpenSSL build and work on VxWorks.
PR: 253, except for the  change that was handled in an earlier
         commit, and a request for easy build of just parts of OpenSSL.
parent ff90d659

Configure

+2 −0
Original line number Diff line number Diff line
@@ -558,6 +558,8 @@ my %table=( 


##### VxWorks for various targets

"vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",

"vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::",

"vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g:::VXWORKS:-r:::::",



);

crypto/bio/bss_bio.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "e_os.h"



/* VxWorks defines SSIZE_MAX with an empty value causing compile errors */

#if defined(OPENSSL_SYS_VSWORKS)

#if defined(OPENSSL_SYS_VXWORKS)

# undef SSIZE_MAX

#endif

#ifndef SSIZE_MAX

crypto/conf/conf_def.c

+5 −4
Original line number Diff line number Diff line
@@ -208,7 +208,8 @@ static int def_load(CONF *conf, const char *name, long *line) 


static int def_load_bio(CONF *conf, BIO *in, long *line)

	{

#define BUFSIZE	512

/* The macro BUFSIZE conflicts with a system macro in VxWorks */

#define CONFBUFSIZE	512

	int bufnum=0,i,ii;

	BUF_MEM *buff=NULL;

	char *s,*p,*end;
@@ -255,15 +256,15 @@ static int def_load_bio(CONF *conf, BIO *in, long *line) 
	for (;;)

		{

		again=0;

		if (!BUF_MEM_grow(buff,bufnum+BUFSIZE))

		if (!BUF_MEM_grow(buff,bufnum+CONFBUFSIZE))

			{

			CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_BUF_LIB);

			goto err;

			}

		p= &(buff->data[bufnum]);

		*p='\0';

		BIO_gets(in, p, BUFSIZE-1);

		p[BUFSIZE-1]='\0';

		BIO_gets(in, p, CONFBUFSIZE-1);

		p[CONFBUFSIZE-1]='\0';

		ii=i=strlen(p);

		if (i == 0) break;

		while (i > 0)

crypto/des/read_pwd.c

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
#define SGTTY

#endif



#if defined(OPENSSL_SYS_VSWORKS)

#if defined(OPENSSL_SYS_VXWORKS)

#undef TERMIOS

#undef TERMIO

#undef SGTTY
@@ -274,7 +274,7 @@ int des_read_pw(char *buf, char *buff, int size, const char *prompt, 
#ifdef OPENSSL_SYS_MSDOS

	if ((tty=fopen("con","r")) == NULL)

		tty=stdin;

#elif defined(MAC_OS_pre_X) || defined(OPENSSL_SYS_VSWORKS)

#elif defined(MAC_OS_pre_X) || defined(OPENSSL_SYS_VXWORKS)

	tty=stdin;

#else

#ifndef OPENSSL_SYS_MPE

crypto/rand/rand_egd.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ int RAND_egd_bytes(const char *path,int bytes) 
#include <sys/types.h>

#include <sys/socket.h>

#ifndef NO_SYS_UN_H

# ifdef OPENSSL_SYS_VSWORKS

# ifdef OPENSSL_SYS_VXWORKS

#   include <streams/un.h>

# else

#   include <sys/un.h>