Now the FIPS capable OpenSSL is available simplify the various FIPS test

[thirdparty/openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 8f01f0c462fc60feb520003d79749017a8b4b10b..5d024b15cb8be8f02be31c78ba347e210f0992df 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -60,6 +60,7 @@ my %mf_import = (
        CMLL_ENC       => \$mf_cm_asm,
        MODES_ASM_OBJ  => \$mf_modes_asm,
        FIPSCANISTERONLY  => \$mf_fipscanisteronly
+       FIPSCANISTERINTERNAL  => \$mf_fipscanisterinternal
 );
 
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -75,7 +76,7 @@ close(IN);
 
 $debug = 1 if $mf_platform =~ /^debug-/;
 
-if ($mf_fipscanisteronly eq "y") {
+if ($mf_fipscanisterinternal eq "y") {
        $fips = 1;
        $fipscanisterbuild = 1;
        $fipscanisteronly = 1;
@@ -1196,7 +1197,7 @@ sub perlasm_compile_target
        $bname =~ s/(.*)\.[^\.]$/$1/;
        $ret ="\$(TMP_D)$o$bname.asm: $source\n";
        $ret.="\t\$(PERL) $source $asmtype \$(CFLAG) >\$\@\n";
-       if ($cflags =~ /-DOPENSSL_FIPSSYMS/)
+       if ($fipscanisteronly)
                {
                $ret .= "\t\$(PERL) util\\fipsas.pl . \$@ norunasm \$(CFLAG)\n";
                }