Commit 28a80034 authored by Richard Levitte's avatar Richard Levitte
Browse files

Changes for VOS, submitted by Paul Green <Paul.Green@stratus.com>. 

PR: 499
parent 563cd0f2

Configure

+15 −8
Original line number Diff line number Diff line
@@ -155,6 +155,12 @@ my %table=( 
"gcc",		"gcc:-O3::(unknown):::BN_LLONG:::",

"cc",		"cc:-O::(unknown)::::::",



####VOS Configurations

"vos-gcc","gcc:-b hppa1.1-stratus-vos -O3 -Wall -Wuninitialized -D_POSIX_C_SOURCE=200112L -D_BSD::(unknown):VOS:-Wl,-map:BN_LLONG:::::::::::::.so:",

"debug-vos-gcc","gcc:-b hppa1.1-stratus-vos -O0 -g -Wall -D_POSIX_C_SOURCE=200112L -D_BSD -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG::(unknown):VOS:-Wl,-map:BN_LLONG:::::::::::::.so:",

"vos-vcc","vcc:-b i386-stratus-vos -O3 -D_POSIX_C_SOURCE=200112L -D_BSD::(unknown):VOS:-Wl,-map::::::::::::::.so:",

"debug-vos-vcc","vcc:-b i386-stratus-vos -O0 -g -D_POSIX_C_SOURCE=200112L -D_BSD -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG::(unknown):VOS:-Wl,-map::::::::::::::.so:",



#### Solaris x86 with GNU C setups

# -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have to do it

# here because whenever GNU C instantiates an assembler template it
@@ -385,7 +391,7 @@ my %table=( 
"debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",

"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",

"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",

"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",

"linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -653,10 +659,6 @@ my $no_sha=0; 
my $no_rsa=0;

my $no_dh=0;



$default_ranlib= &which("ranlib") or $default_ranlib="true";

$perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl")

  or $perl="perl";



&usage if ($#ARGV < 0);



my $flags;
@@ -953,9 +955,14 @@ my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; 


$exe_ext=".exe" if ($target eq "Cygwin");

$exe_ext=".exe" if ($target eq "DJGPP");

$exe_ext=".pm" if ($target eq "vos-gcc" or $target eq "debug-vos-gcc" or $target eq "vos-vcc" or $target eq "debug-vos-vcc");

$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");

$prefix=$openssldir if $prefix eq "";



$default_ranlib= &which("ranlib") or $default_ranlib="true";

$perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl")

  or $perl="perl";



chop $openssldir if $openssldir =~ /\/$/;

chop $prefix if $prefix =~ /\/$/;
@@ -1692,10 +1699,10 @@ sub which 
	my $path;

	foreach $path (split /:/, $ENV{PATH})

		{

		if (-f "$path/$name" and -x _)

		if (-f "$path/$name$exe_ext" and -x _)

			{

			return "$path/$name" unless ($name eq "perl" and

			 system("$path/$name -e " . '\'exit($]<5.0);\''));

			return "$path/$name$exe_ext" unless ($name eq "perl" and

			 system("$path/$name$exe_ext -e " . '\'exit($]<5.0);\''));

			}

		}

	}

Makefile.org

+4 −2
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ dclean: 


rehash: rehash.time

rehash.time: certs

	@(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \

	@(OPENSSL="`pwd`/apps/openssl$(EXE_EXT)"; OPENSSL_DEBUG_MEMORY=on; \

		export OPENSSL OPENSSL_DEBUG_MEMORY; \

		LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \

		DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \
@@ -493,7 +493,9 @@ dist: 
dist_pem_h:

	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)



install: all install_docs

install: all install_docs install_sw



install_sw:

	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \

		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \

		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \

apps/Makefile.ssl

+5 −5
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ top: 


all:	exe



exe:	$(PROGRAM)

exe:	$(EXE)



req: sreq.o $(A_OBJ) $(DLIBCRYPTO)

	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
@@ -151,8 +151,8 @@ $(DLIBSSL): 
$(DLIBCRYPTO):

	(cd ..; $(MAKE) DIRS=crypto all)



$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)

	$(RM) $(PROGRAM)

$(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)

	$(RM) $(EXE)

	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \

		shlib_target="$(SHLIB_TARGET)"; \

	fi; \
@@ -162,12 +162,12 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) 
	  LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \

	fi; \

	$(NEWMAKE) -f $(TOP)/Makefile.shared \

		APPNAME=$(PROGRAM) LDFLAGS="$(CFLAG)" \

		APPNAME=$(EXE) LDFLAGS="$(CFLAG)" \

		OBJECTS="$(PROGRAM).o $(E_OBJ)" \

		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \

		LIBRPATH=$(INSTALLTOP)/lib \

		link_app.$${shlib_target}

	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; \

	-(cd ..; OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \

		LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \

		DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \

		SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \

config

+18 −5
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
PREFIX=""

SUFFIX=""

TEST="false"

EXE=""



# pick up any command line args to config

for i
@@ -284,6 +285,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in 
	echo "${MACHINE}-whatever-sysv4"; exit 0

	;;



    VOS:*:*:i786)

     echo "i386-stratus-vos"; exit 0

     ;;



    VOS:*:*:*)

     echo "hppa1.1-stratus-vos"; exit 0

     ;;



    *:4*:R4*:m88k)

	echo "${MACHINE}-whatever-sysv4"; exit 0

	;;
@@ -672,6 +681,10 @@ EOF 
  *-*-UnixWare21*) OUT="unixware-2.1" ;;

  *-*-Unixware20*) OUT="unixware-2.0" ;;

  *-*-Unixware21*) OUT="unixware-2.1" ;;

  *-*-vos)

	options="$options no-threads no-shared no-asm no-dso"

	EXE=".pm"

	OUT="vos-$CC" ;;

  BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;

  RM*-siemens-sysv4) OUT="ReliantUNIX" ;;

  *-siemens-sysv4) OUT="SINIX" ;;
@@ -819,8 +832,8 @@ fi 


if [ ".$PERL" = . ] ; then

	for i in . `echo $PATH | sed 's/:/ /g'`; do

		if [ -f "$i/perl5" ] ; then

			PERL="$i/perl5"

		if [ -f "$i/perl5$EXE" ] ; then

			PERL="$i/perl5$EXE"

			break;

		fi;

	done
@@ -828,9 +841,9 @@ fi 


if [ ".$PERL" = . ] ; then

	for i in . `echo $PATH | sed 's/:/ /g'`; do

		if [ -f "$i/perl" ] ; then

			if "$i/perl" -e 'exit($]<5.0)'; then

				PERL="$i/perl"

		if [ -f "$i/perl$EXE" ] ; then

			if "$i/perl$EXE" -e 'exit($]<5.0)'; then

				PERL="$i/perl$EXE"

				break;

			fi;

		fi;

crypto/rand/rand_egd.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
 *   RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255.

 */



#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE)

#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_VOS)

int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)

	{

	return(-1);