The rest of the merge in of the main trunk, a few conflicts resolved. (ce699073) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configure

+10 −1

Original line number	Diff line number	Diff line
		@@ -221,12 +221,21 @@ my %table=(
		# crypto/sha/sha_lcl.h.
		# <appro@fy.chalmers.se>
		#
		"hpux-parisc-cc","cc:-Ae +O3 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
		#!#"hpux-parisc-cc","cc:-Ae +O3 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
		# Since there is mention of this in shlib/hpux10-cc.sh
		"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
		"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
		"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl",

		# More attempts at unified 10.X and 11.X targets for HP C compiler.
		#
		# Chris Ruemmler <ruemmler@cup.hp.com>
		# Kevin Steves <ks@hp.se>
		"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldl:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl",
		"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2.o:::::::::dl",
		"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2W.o:::::::::dl",
		"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl",

		# HPUX 9.X config.
		# Don't use the bundled cc. It is broken. Use HP ANSI C if possible, or
		# egcs. gcc 2.8.1 is also broken.

README

+1 −1

Original line number	Diff line number	Diff line

		OpenSSL 0.9.6-beta1 [engine] 11 Sep 2000
		OpenSSL 0.9.6-beta2 [engine] 17 Sep 2000

		Copyright (c) 1998-2000 The OpenSSL Project
		Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

TABLE

+64 −4

Original line number	Diff line number	Diff line
		@@ -1162,11 +1162,11 @@ $shared_cflag =

		*** hpux-parisc-cc
		$cc = cc
		$cflags = -Ae +O3 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY
		$cflags = +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY
		$unistd =
		$thread_cflag =
		$lflags = -ldld
		$bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
		$thread_cflag = -D_REENTRANT
		$lflags = -ldl
		$bn_ops = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
		$bn_obj =
		$des_obj =
		$bf_obj =
		@@ -1220,6 +1220,46 @@ $dso_scheme = dl
		$shared_target=
		$shared_cflag =

		*** hpux-parisc1_1-cc
		$cc = cc
		$cflags = +DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY
		$unistd =
		$thread_cflag = -D_REENTRANT
		$lflags = -ldl
		$bn_ops = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
		$bn_obj =
		$des_obj =
		$bf_obj =
		$md5_obj =
		$sha1_obj =
		$cast_obj =
		$rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$dso_scheme = dl
		$shared_target=
		$shared_cflag =

		*** hpux-parisc2-cc
		$cc = cc
		$cflags = +DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY
		$unistd =
		$thread_cflag = -D_REENTRANT
		$lflags = -ldl
		$bn_ops = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
		$bn_obj = asm/pa-risc2.o
		$des_obj =
		$bf_obj =
		$md5_obj =
		$sha1_obj =
		$cast_obj =
		$rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$dso_scheme = dl
		$shared_target=
		$shared_cflag =

		*** hpux10-brokencc
		$cc = cc
		$cflags = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z
		@@ -1320,6 +1360,26 @@ $dso_scheme = dl
		$shared_target=
		$shared_cflag =

		*** hpux64-parisc2-cc
		$cc = cc
		$cflags = +DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY
		$unistd =
		$thread_cflag = -D_REENTRANT
		$lflags = -ldl
		$bn_ops = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
		$bn_obj = asm/pa-risc2W.o
		$des_obj =
		$bf_obj =
		$md5_obj =
		$sha1_obj =
		$cast_obj =
		$rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$dso_scheme = dl
		$shared_target=
		$shared_cflag =

		*** irix-cc
		$cc = cc
		$cflags = -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN

apps/apps.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -662,7 +662,7 @@ STACK_OF(X509) load_certs(BIO err, char *file, int format)

		if (format == FORMAT_PEM)
		{
		othercerts = sk_X509_new(NULL);
		othercerts = sk_X509_new_null();
		if(!othercerts)
		{
		sk_X509_free(othercerts);

apps/crl2p7.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ int MAIN(int argc, char **argv)
		else if (strcmp(*argv,"-certfile") == 0)
		{
		if (--argc < 1) goto bad;
		if(!certflst) certflst = sk_new(NULL);
		if(!certflst) certflst = sk_new_null();
		sk_push(certflst,*(++argv));
		}
		else
		@@ -215,7 +215,7 @@ bad:
		p7s->contents->type=OBJ_nid2obj(NID_pkcs7_data);

		if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
		if ((crl_stack=sk_X509_CRL_new(NULL)) == NULL) goto end;
		if ((crl_stack=sk_X509_CRL_new_null()) == NULL) goto end;
		p7s->crl=crl_stack;
		if (crl != NULL)
		{
		@@ -223,7 +223,7 @@ bad:
		crl=NULL; /* now part of p7 for OPENSSL_freeing */
		}

		if ((cert_stack=sk_X509_new(NULL)) == NULL) goto end;
		if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
		p7s->cert=cert_stack;

		if(certflst) for(i = 0; i < sk_num(certflst); i++) {