Now the FIPS capable OpenSSL is available simplify the various FIPS test
build options.
All fispcanisterbuild builds only build fipscanister.o and include symbol
renaming.
Move all renamed symbols to fipssyms.h
Update README.FIPS
diff --git a/util/fipsas.pl b/util/fipsas.pl
index cad7c08..6e10d7d 100644
--- a/util/fipsas.pl
+++ b/util/fipsas.pl
@@ -19,7 +19,7 @@
my $enabled = 0;
-$enabled = 1 if $ENV{CFLAG} =~ /-DOPENSSL_FIPSSYMS/;
+$enabled = 1 if $ENV{FIPSCANISTERINTERNAL} eq "y";
if ($enabled == 0 && $runasm)
{
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 8f01f0c..5d024b1 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -60,6 +60,7 @@
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 @@
$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 @@
$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";
}
