Commit d8bd55a3 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from stable branch.

parent 841c91d6

util/mkdef.pl

+5 −1
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", 
			 "TLSEXT", "PSK",

			 # CMS

			 "CMS",

			 # CryptoAPI Engine

			 "CAPIENG",

			 # Deprecated functions

			 "DEPRECATED" );
@@ -120,7 +122,7 @@ my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; 
my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;

my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;

my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;

my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms;

my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;



my $zlib;
@@ -209,6 +211,7 @@ foreach (@ARGV, split(/ /, $options)) 
	elsif (/^no-rfc3779$/)	{ $no_rfc3779=1; }

	elsif (/^no-tlsext$/)	{ $no_tlsext=1; }

	elsif (/^no-cms$/)	{ $no_cms=1; }

	elsif (/^no-capieng$/)	{ $no_capieng=1; }

	}
@@ -1138,6 +1141,7 @@ sub is_valid 
			if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }

			if ($keyword eq "PSK" && $no_psk) { return 0; }

			if ($keyword eq "CMS" && $no_cms) { return 0; }

			if ($keyword eq "CAPIENG" && $no_capieng) { return 0; }

			if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }



			# Nothing recognise as true

util/pl/VC-32.pl

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ sub do_lib_rule 
			{

			$ex.=' unicows.lib' if ($FLAVOR =~ /NT/);

			$ex.=' ws2_32.lib gdi32.lib advapi32.lib user32.lib';

			$ex.=' crypt32.lib';

			$ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);

			}

		$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;