Commit 340daf6a authored by Rich Salz's avatar Rich Salz
Browse files

Merge branch 'master' of git.openssl.org:openssl

parents 327f3c04 44724bee

apps/ca.c

+2 −0
Original line number Diff line number Diff line
@@ -1628,12 +1628,14 @@ static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509, 
		{

		ok=0;

		BIO_printf(bio_err,"Signature verification problems....\n");

		ERR_print_errors(bio_err);

		goto err;

		}

	if (i == 0)

		{

		ok=0;

		BIO_printf(bio_err,"Signature did not match the certificate request\n");

		ERR_print_errors(bio_err);

		goto err;

		}

	else

apps/ciphers.c

+0 −6
Original line number Diff line number Diff line
@@ -100,13 +100,7 @@ int MAIN(int argc, char **argv) 
	char buf[512];

	BIO *STDout=NULL;



#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)

	meth=SSLv23_server_method();

#elif !defined(OPENSSL_NO_SSL3)

	meth=SSLv3_server_method();

#elif !defined(OPENSSL_NO_SSL2)

	meth=SSLv2_server_method();

#endif



	apps_startup();

apps/progs.h

+4 −4
Original line number Diff line number Diff line
@@ -107,16 +107,16 @@ FUNCTION functions[] = { 
	{FUNC_TYPE_GENERAL,"gendsa",gendsa_main},

#endif

	{FUNC_TYPE_GENERAL,"genpkey",genpkey_main},

#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))

#if !defined(OPENSSL_NO_SOCK)

	{FUNC_TYPE_GENERAL,"s_server",s_server_main},

#endif

#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))

#if !defined(OPENSSL_NO_SOCK)

	{FUNC_TYPE_GENERAL,"s_client",s_client_main},

#endif

#ifndef OPENSSL_NO_SPEED

	{FUNC_TYPE_GENERAL,"speed",speed_main},

#endif

#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))

#if !defined(OPENSSL_NO_SOCK)

	{FUNC_TYPE_GENERAL,"s_time",s_time_main},

#endif

	{FUNC_TYPE_GENERAL,"version",version_main},
@@ -126,7 +126,7 @@ FUNCTION functions[] = { 
#endif

	{FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main},

	{FUNC_TYPE_GENERAL,"sess_id",sess_id_main},

#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))

#if !defined(OPENSSL_NO_SOCK)

	{FUNC_TYPE_GENERAL,"ciphers",ciphers_main},

#endif

	{FUNC_TYPE_GENERAL,"nseq",nseq_main},

apps/progs.pl

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ foreach (@ARGV) 
	push(@files,$_);

	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";

	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))

		{ print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } 

		{ print "#if !defined(OPENSSL_NO_SOCK)\n${str}#endif\n"; } 

	elsif ( ($_ =~ /^speed$/))

		{ print "#ifndef OPENSSL_NO_SPEED\n${str}#endif\n"; }

	elsif ( ($_ =~ /^engine$/))

crypto/aes/asm/aesni-mb-x86_64.pl

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && 
	$avx = ($1>=10) + ($1>=11);

}



if (!$avx && `$ENV{CC} -v 2>&1` =~ /LLVM ([3-9]\.[0-9]+)/) {

	$avx = ($1>=3.0) + ($1>=3.1);

if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {

	$avx = ($2>=3.0) + ($2>3.0);

}



open OUT,"| \"$^X\" $xlate $flavour $output";