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

Recognise NO_NISTP224-64-GCC-128

parent 4fe4c00e

util/mkdef.pl

+4 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 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_capieng;

my $no_jpake; my $no_srp; my $no_ssl2;

my $no_jpake; my $no_srp; my $no_ssl2; my $no_nistp_gcc;



my $zlib;
@@ -219,6 +219,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-nistp224-64-gcc-128$/)	{ $no_nistp_gcc=1; }

	elsif (/^no-ssl2$/)	{ $no_ssl2=1; }

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

	elsif (/^no-jpake$/)	{ $no_jpake=1; }
@@ -1178,6 +1179,8 @@ 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 "NISTP224-64-GCC-128" && $no_nistp_gcc)

					{ return 0; }

			if ($keyword eq "SSL2" && $no_ssl2) { return 0; }

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

			if ($keyword eq "JPAKE" && $no_jpake) { return 0; }