1 files changed, 10 insertions, 77 deletions

diff --git a/src/lib/libcrypto/util/mk1mf.pl b/src/lib/libcrypto/util/mk1mf.pl
index 72fa089f6b..1dcef2b8a2 100644
--- a/src/lib/libcrypto/util/mk1mf.pl
+++ b/src/lib/libcrypto/util/mk1mf.pl
@@ -18,8 +18,6 @@ local $zlib_opt = 0;	# 0 = no zlib, 1 = static, 2 = dynamic
 local $zlib_lib = "";
 local $perl_asm = 0;    # 1 to autobuild asm files from perl scripts
 
-my $ex_l_libs = "";
-
 # Options to import from top level Makefile
 
 my %mf_import = (
@@ -42,9 +40,7 @@ my %mf_import = (
         SHA1_ASM_OBJ   => \$mf_sha_asm,
         RMD160_ASM_OBJ => \$mf_rmd_asm,
         WP_ASM_OBJ     => \$mf_wp_asm,
-        CMLL_ENC       => \$mf_cm_asm,
-        BASEADDR       => \$baseaddr,
-        FIPSDIR        => \$fipsdir,
+        CMLL_ENC       => \$mf_cm_asm
 );
 
 
@@ -108,7 +104,6 @@ and [options] can be one of
         just-ssl                                - remove all non-ssl keys/digest
         no-asm                                  - No x86 asm
         no-krb5                                 - No KRB5
-        no-srp                                  - No SRP
         no-ec                                   - No EC
         no-ecdsa                                - No ECDSA
         no-ecdh                                 - No ECDH
@@ -233,8 +228,6 @@ else
         $cflags.=' -DTERMIO';
         }
 
-$fipsdir =~ s/\//${o}/g;
-
 $out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":"");
 $tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:$tmp_def.($debug?".dbg":"");
 $inc_dir=(defined($VARS{'INC'}))?$VARS{'INC'}:$inc_def;
@@ -268,7 +261,6 @@ $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
 $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
 $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
 $cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
-$cflags.=" -DOPENSSL_NO_SRP" if $no_srp;
 $cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
 $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
@@ -278,9 +270,7 @@ $cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
 $cflags.=" -DOPENSSL_NO_GOST" if $no_gost;
 $cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;
 $cflags.=" -DOPENSSL_NO_HW"   if $no_hw;
-$cflags.=" -DOPENSSL_FIPS"    if $fips;
 $cflags.=" -DOPENSSL_NO_JPAKE"    if $no_jpake;
-$cflags.=" -DOPENSSL_NO_EC2M"    if $no_ec2m;
 $cflags.= " -DZLIB" if $zlib_opt;
 $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
 
@@ -414,11 +404,6 @@ else
         \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
 EOF
         $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
-        if ($fips)
-                {
-                $build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)";
-                $ex_l_libs .= " \$(O_FIPSCANISTER)";
-                }
         }
 
 $defs= <<"EOF";
@@ -480,18 +465,6 @@ MKLIB=$bin_dir$mklib
 MLFLAGS=$mlflags
 ASM=$bin_dir$asm
 
-# FIPS validated module and support file locations
-
-FIPSDIR=$fipsdir
-BASEADDR=$baseaddr
-FIPSLIB_D=\$(FIPSDIR)${o}lib
-FIPS_PREMAIN_SRC=\$(FIPSLIB_D)${o}fips_premain.c
-O_FIPSCANISTER=\$(FIPSLIB_D)${o}fipscanister.lib
-FIPS_SHA1_EXE=\$(FIPSDIR)${o}bin${o}fips_standalone_sha1${exep}
-E_PREMAIN_DSO=fips_premain_dso
-PREMAIN_DSO_EXE=\$(BIN_D)${o}fips_premain_dso$exep
-FIPSLINK=\$(PERL) \$(FIPSDIR)${o}bin${o}fipslink.pl
-
 ######################################################
 # You should not need to touch anything below this point
 ######################################################
@@ -524,7 +497,7 @@ SO_CRYPTO= $plib\$(CRYPTO)$so_shlibp
 L_SSL=     \$(LIB_D)$o$plib\$(SSL)$libp
 L_CRYPTO=  \$(LIB_D)$o$plib\$(CRYPTO)$libp
 
-L_LIBS= \$(L_SSL) \$(L_CRYPTO) $ex_l_libs
+L_LIBS= \$(L_SSL) \$(L_CRYPTO)
 
 ######################################################
 # Don't touch anything below this point
@@ -540,7 +513,7 @@ LIBS_DEP=\$(O_CRYPTO) \$(O_SSL)
 EOF
 
 $rules=<<"EOF";
-all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe $build_targets
+all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe
 
 banner:
 $banner
@@ -656,16 +629,6 @@ $rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");
 $defs.=&do_defs("E_OBJ",$e_exe,"\$(OBJ_D)",$obj);
 $rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');
 
-# Special case rule for fips_premain_dso
-
-if ($fips)
-        {
-        $rules.=&cc_compile_target("\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj",
-                "\$(FIPS_PREMAIN_SRC)",
-                "-DFINGERPRINT_PREMAIN_DSO_LOAD \$(SHLIB_CFLAGS)", "");
-        $rules.=&do_link_rule("\$(PREMAIN_DSO_EXE)","\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj \$(CRYPTOOBJ) \$(O_FIPSCANISTER)","","\$(EX_LIBS)", 1);
-        }
-
 foreach (values %lib_nam)
         {
         $lib_obj=$lib_obj{$_};
@@ -714,28 +677,7 @@ foreach (split(/\s+/,$engines))
 
 
 $rules.= &do_lib_rule("\$(SSLOBJ)","\$(O_SSL)",$ssl,$shlib,"\$(SO_SSL)");
-
-if ($fips)
-        {
-        if ($shlib)
-                {
-                $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
-                                "\$(O_CRYPTO)", "$crypto",
-                                $shlib, "\$(SO_CRYPTO)", "\$(BASEADDR)");
-                }
-        else
-                {
-                $rules.= &do_lib_rule("\$(CRYPTOOBJ)",
-                        "\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)", "");
-                $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
-                        "\$(LIB_D)$o$crypto_compat",$crypto,$shlib,"\$(SO_CRYPTO)", "");
-                }
-        }
-        else
-        {
-        $rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,
-                                                        "\$(SO_CRYPTO)");
-        }
+$rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)");
 
 foreach (split(" ",$otherlibs))
         {
@@ -745,7 +687,7 @@ foreach (split(" ",$otherlibs))
 
         }
 
-$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)", ($fips && !$shlib) ? 2 : 0);
+$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
 
 print $defs;
 
@@ -839,8 +781,6 @@ sub var_add
         @a=grep(!/(^sha1)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1;
         @a=grep(!/_mdc2$/,@a) if $no_mdc2;
 
-        @a=grep(!/(srp)/,@a) if $no_srp;
-
         @a=grep(!/^engine$/,@a) if $no_engine;
         @a=grep(!/^hw$/,@a) if $no_hw;
         @a=grep(!/(^rsa$)|(^genrsa$)/,@a) if $no_rsa;
@@ -999,15 +939,14 @@ sub Sasm_compile_target
 
 sub cc_compile_target
         {
-        local($target,$source,$ex_flags, $srcd)=@_;
+        local($target,$source,$ex_flags)=@_;
         local($ret);
         
         $ex_flags.=" -DMK1MF_BUILD -D$platform_cpp_symbol" if ($source =~ /cversion/);
         $target =~ s/\//$o/g if $o ne "/";
         $source =~ s/\//$o/g if $o ne "/";
-        $srcd = "\$(SRC_D)$o" unless defined $srcd;
-        $ret ="$target: $srcd$source\n\t";
-        $ret.="\$(CC) ${ofile}$target $ex_flags -c $srcd$source\n\n";
+        $ret ="$target: \$(SRC_D)$o$source\n\t";
+        $ret.="\$(CC) ${ofile}$target $ex_flags -c \$(SRC_D)$o$source\n\n";
         return($ret);
         }
 
@@ -1117,11 +1056,8 @@ sub read_options
                 "no-ssl2" => \$no_ssl2,
                 "no-ssl3" => \$no_ssl3,
                 "no-tlsext" => \$no_tlsext,
-                "no-srp" => \$no_srp,
                 "no-cms" => \$no_cms,
-                "no-ec2m" => \$no_ec2m,
                 "no-jpake" => \$no_jpake,
-                "no-ec_nistp_64_gcc_128" => 0,
                 "no-err" => \$no_err,
                 "no-sock" => \$no_sock,
                 "no-krb5" => \$no_krb5,
@@ -1131,12 +1067,11 @@ sub read_options
                 "no-gost" => \$no_gost,
                 "no-engine" => \$no_engine,
                 "no-hw" => \$no_hw,
-                "no-rsax" => 0,
                 "just-ssl" =>
                         [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast,
                           \$no_md2, \$no_sha, \$no_mdc2, \$no_dsa, \$no_dh,
                           \$no_ssl2, \$no_err, \$no_ripemd, \$no_rc5,
-                          \$no_aes, \$no_camellia, \$no_seed, \$no_srp],
+                          \$no_aes, \$no_camellia, \$no_seed],
                 "rsaref" => 0,
                 "gcc" => \$gcc,
                 "debug" => \$debug,
@@ -1144,7 +1079,6 @@ sub read_options
                 "shlib" => \$shlib,
                 "dll" => \$shlib,
                 "shared" => 0,
-                "no-sctp" => 0,
                 "no-gmp" => 0,
                 "no-rfc3779" => 0,
                 "no-montasm" => 0,
@@ -1152,7 +1086,6 @@ sub read_options
                 "no-store" => 0,
                 "no-zlib" => 0,
                 "no-zlib-dynamic" => 0,
-                "fips" => \$fips
                 );
 
         if (exists $valid_options{$_})
@@ -1222,7 +1155,7 @@ sub read_options
                                 }
                         }
                 }
-        elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }
+        elsif (/^([^=]*)=(.*)$/ && !/^-D/){ $VARS{$1}=$2; }
         elsif (/^-[lL].*$/)     { $l_flags.="$_ "; }
         elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/)
                 { $c_flags.="$_ "; }