Merge of main trunk, conflicts resolved. (2be96941) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+4 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,10 @@

		Changes between 0.9.5a and 0.9.6 [xx XXX 2000]

		*) Add RAND_egd_bytes(), which gives control over the number of bytes read
		from EGD.
		[Ben Laurie]

		*) Add a few more EBCDIC conditionals that make `req' and `x509'
		work better on such systems.
		[Martin Kraemer <Martin.Kraemer@MchP.Siemens.De>]

Configure

+2 −2

Original line number	Diff line number	Diff line
		@@ -284,8 +284,8 @@ my %table=(
		# The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
		# bn86-elf.o file file since it is hand tweaked assembler.
		"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
		"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence: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::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",
		"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-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
		"linux-mips", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
		"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",

STATUS

+12 −1

Original line number	Diff line number	Diff line

		OpenSSL STATUS Last modified at
		______________ $Date: 2000/09/11 13:28:30 $
		______________ $Date: 2000/09/12 08:37:49 $

		DEVELOPMENT STATE

		o OpenSSL 0.9.6: Under development (in release cycle)...
		Proposed release date September 24, 2000
		0.9.6-beta1 is available:
		OpenBSD-x86 2.7 - failed (ftime/TIMEB)
		hpux-parisc-cc 10.20 - passed
		hpux-parisc-gcc 10.20 - passed
		hpux-gcc - passed
		hpux-brokengcc - failed (BN_sqr)
		linux-elf - passed
		linux-sparcv7 - passed
		Solaris [engine] - failed (speed cswift)
		sco5-gcc - passed
		sco5-cc - passed
		o OpenSSL 0.9.5a: Released on April 1st, 2000
		o OpenSSL 0.9.5: Released on February 28th, 2000
		o OpenSSL 0.9.4: Released on August 09th, 1999

apps/CA.pl.in

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@
		# default openssl.cnf file has setup as per the following
		# demoCA ... where everything is stored

		$SSLEAY_CONFIG=$ENV{"SSLEAY_CONFIG"};
		$DAYS="-days 365";
		$REQ="openssl req $SSLEAY_CONFIG";
		$CA="openssl ca $SSLEAY_CONFIG";

apps/speed.c

+113 −66

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@
		#elif !defined(MSDOS) && (!defined(VMS) \|\| defined(__DECC))
		# define TIMES
		#endif
		#if !defined(_UNICOS)
		#if !defined(_UNICOS) && !defined(__OpenBSD__)
		# define TIMEB
		#endif

		@@ -1167,49 +1167,73 @@ int MAIN(int argc, char **argv)
		int ret;
		if (!rsa_doit[j]) continue;
		ret=RSA_sign(NID_md5_sha1, buf,36, buf2, &rsa_num, rsa_key[j]);
		pkey_print_message("private","rsa",rsa_c[j][0],rsa_bits[j],
		if (ret == 0)
		{
		BIO_printf(bio_err,"RSA sign failure. No RSA sign will be done.\n");
		ERR_print_errors(bio_err);
		rsa_count=1;
		}
		else
		{
		pkey_print_message("private","rsa",
		rsa_c[j][0],rsa_bits[j],
		RSA_SECONDS);
		/* RSA_blinding_on(rsa_key[j],NULL); */
		Time_F(START,usertime);
		for (count=0,run=1; COND(rsa_c[j][0]); count++)
		{
		ret=RSA_sign(NID_md5_sha1, buf,36, buf2, &rsa_num,
		rsa_key[j]);
		if (ret <= 0)
		ret=RSA_sign(NID_md5_sha1, buf,36, buf2,
		&rsa_num, rsa_key[j]);
		if (ret == 0)
		{
		BIO_printf(bio_err,"RSA private encrypt failure\n");
		BIO_printf(bio_err,
		"RSA sign failure\n");
		ERR_print_errors(bio_err);
		count=1;
		break;
		}
		}
		d=Time_F(STOP,usertime);
		BIO_printf(bio_err,"%ld %d bit private RSA's in %.2fs\n",
		BIO_printf(bio_err,
		"%ld %d bit private RSA's in %.2fs\n",
		count,rsa_bits[j],d);
		rsa_results[j][0]=d/(double)count;
		rsa_count=count;
		}

		#if 1
		ret=RSA_verify(NID_md5_sha1, buf,36, buf2, rsa_num, rsa_key[j]);
		pkey_print_message("public","rsa",rsa_c[j][1],rsa_bits[j],
		if (ret <= 0)
		{
		BIO_printf(bio_err,"RSA verify failure. No RSA verify will be done.\n");
		ERR_print_errors(bio_err);
		dsa_doit[j] = 0;
		}
		else
		{
		pkey_print_message("public","rsa",
		rsa_c[j][1],rsa_bits[j],
		RSA_SECONDS);
		Time_F(START,usertime);
		for (count=0,run=1; COND(rsa_c[j][1]); count++)
		{
		ret=RSA_verify(NID_md5_sha1, buf,36, buf2, rsa_num,
		rsa_key[j]);
		if (ret <= 0)
		ret=RSA_verify(NID_md5_sha1, buf,36, buf2,
		rsa_num, rsa_key[j]);
		if (ret == 0)
		{
		BIO_printf(bio_err,"RSA verify failure\n");
		BIO_printf(bio_err,
		"RSA verify failure\n");
		ERR_print_errors(bio_err);
		count=1;
		break;
		}
		}
		d=Time_F(STOP,usertime);
		BIO_printf(bio_err,"%ld %d bit public RSA's in %.2fs\n",
		BIO_printf(bio_err,
		"%ld %d bit public RSA's in %.2fs\n",
		count,rsa_bits[j],d);
		rsa_results[j][1]=d/(double)count;
		}
		#endif

		if (rsa_count <= 1)
		@@ -1231,22 +1255,33 @@ int MAIN(int argc, char **argv)
		for (j=0; j<DSA_NUM; j++)
		{
		unsigned int kk;
		int ret;

		if (!dsa_doit[j]) continue;
		DSA_generate_key(dsa_key[j]);
		/* DSA_sign_setup(dsa_key[j],NULL); */
		rsa_num=DSA_sign(EVP_PKEY_DSA,buf,20,buf2,
		ret=DSA_sign(EVP_PKEY_DSA,buf,20,buf2,
		&kk,dsa_key[j]);
		pkey_print_message("sign","dsa",dsa_c[j][0],dsa_bits[j],
		if (ret == 0)
		{
		BIO_printf(bio_err,"DSA sign failure. No DSA sign will be done.\n");
		ERR_print_errors(bio_err);
		rsa_count=1;
		}
		else
		{
		pkey_print_message("sign","dsa",
		dsa_c[j][0],dsa_bits[j],
		DSA_SECONDS);
		Time_F(START,usertime);
		for (count=0,run=1; COND(dsa_c[j][0]); count++)
		{
		rsa_num=DSA_sign(EVP_PKEY_DSA,buf,20,buf2,
		ret=DSA_sign(EVP_PKEY_DSA,buf,20,buf2,
		&kk,dsa_key[j]);
		if (rsa_num == 0)
		if (ret == 0)
		{
		BIO_printf(bio_err,"DSA sign failure\n");
		BIO_printf(bio_err,
		"DSA sign failure\n");
		ERR_print_errors(bio_err);
		count=1;
		break;
		@@ -1257,19 +1292,30 @@ int MAIN(int argc, char **argv)
		count,dsa_bits[j],d);
		dsa_results[j][0]=d/(double)count;
		rsa_count=count;
		}

		rsa_num2=DSA_verify(EVP_PKEY_DSA,buf,20,buf2,
		ret=DSA_verify(EVP_PKEY_DSA,buf,20,buf2,
		kk,dsa_key[j]);
		pkey_print_message("verify","dsa",dsa_c[j][1],dsa_bits[j],
		if (ret <= 0)
		{
		BIO_printf(bio_err,"DSA verify failure. No DSA verify will be done.\n");
		ERR_print_errors(bio_err);
		dsa_doit[j] = 0;
		}
		else
		{
		pkey_print_message("verify","dsa",
		dsa_c[j][1],dsa_bits[j],
		DSA_SECONDS);
		Time_F(START,usertime);
		for (count=0,run=1; COND(dsa_c[j][1]); count++)
		{
		rsa_num2=DSA_verify(EVP_PKEY_DSA,buf,20,buf2,
		ret=DSA_verify(EVP_PKEY_DSA,buf,20,buf2,
		kk,dsa_key[j]);
		if (rsa_num2 == 0)
		if (ret <= 0)
		{
		BIO_printf(bio_err,"DSA verify failure\n");
		BIO_printf(bio_err,
		"DSA verify failure\n");
		ERR_print_errors(bio_err);
		count=1;
		break;
		@@ -1279,6 +1325,7 @@ int MAIN(int argc, char **argv)
		BIO_printf(bio_err,"%ld %d bit DSA verify in %.2fs\n",
		count,dsa_bits[j],d);
		dsa_results[j][1]=d/(double)count;
		}

		if (rsa_count <= 1)
		{