Recognise "fips" in mkdef.pl script. (b4baca92) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

util/mkdef.pl

+7 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ my $OS2=0;
		my $safe_stack_def = 0;

		my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
		"EXPORT_VAR_AS_FUNCTION", "ZLIB" );
		"EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS" );
		my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
		my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
		"CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
		@@ -133,6 +133,8 @@ 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_ec2m; my $no_nistp_gcc;

		my $fips;

		my $zlib;


		@@ -155,6 +157,7 @@ foreach (@ARGV, split(/ /, $options))
		}
		$VMS=1 if $_ eq "VMS";
		$OS2=1 if $_ eq "OS2";
		$fips=1 if /^fips/;
		if ($_ eq "zlib" \|\| $_ eq "enable-zlib" \|\| $_ eq "zlib-dynamic"
		\|\| $_ eq "enable-zlib-dynamic") {
		$zlib = 1;
		@@ -1134,6 +1137,9 @@ sub is_valid
		if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX \|\| $W32 \|\| $W16)) {
		return 1;
		}
		if ($keyword eq "OPENSSL_FIPS" && $fips) {
		return 1;
		}
		if ($keyword eq "ZLIB" && $zlib) { return 1; }
		return 0;
		} else {