update date

[openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index b01acf2bbe101c2d019efe9985d453f9a9cd7f3a..f650952f2e3b9a4624826a0fad148fd56727e3ad 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -25,11 +25,16 @@ my $fips_sha1_exe_path = "";
 
 local $fipscanisterbuild = 0;
 
+my $fipscanisteronly = 0;
+
 my $fipslibdir = "";
 my $baseaddr = "";
 
 my $ex_l_libs = "";
 
+my $build_targets = "lib exe";
+my $libs_dep = "\$(O_CRYPTO) \$(O_SSL)";
+
 # Options to import from top level Makefile
 
 my %mf_import = (
@@ -53,7 +58,8 @@ my %mf_import = (
        RMD160_ASM_OBJ => \$mf_rmd_asm,
        WP_ASM_OBJ     => \$mf_wp_asm,
        CMLL_ENC       => \$mf_cm_asm,
-       MODES_ASM_OBJ  => \$mf_modes_asm
+       MODES_ASM_OBJ  => \$mf_modes_asm,
+       FIPSCANISTERONLY  => \$mf_fipscanisteronly
 );
 
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -69,6 +75,13 @@ close(IN);
 
 $debug = 1 if $mf_platform =~ /^debug-/;
 
+if ($mf_fipscanisteronly eq "y") {
+       $fips = 1;
+       $fipscanisterbuild = 1;
+       $fipscanisteronly = 1;
+}
+
+
 die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
 
 $infile="MINFO";
@@ -116,6 +129,7 @@ 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
@@ -273,6 +287,7 @@ $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;
@@ -284,6 +299,7 @@ $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;
 
@@ -370,7 +386,7 @@ for (;;)
        if ($key eq "LIBKRB5")
                { $ex_libs .= " $val" if $val ne "";}
 
-       if ($key eq "TEST")
+       if ($key eq "TEST" && (!$fipscanisteronly || $dir =~ /^fips/ ))
                { $test.=&var_add($dir,$val, 0); }
 
        if (($key eq "PROGS") || ($key eq "E_OBJ"))
@@ -447,7 +463,7 @@ if ($fips)
                                $lib_obj{"FIPS"} .= "$_ ";
                                }
                        }
-               else
+               elsif (!$fipscanisteronly)
                        {
                        $lib_obj{"CRYPTO"} .= "$_ ";
                        }
@@ -497,7 +513,7 @@ if ($fips)
        {
        if (!$shlib)
                {
-               $ex_build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)";
+               $build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)";
                $ex_l_libs .= " \$(O_FIPSCANISTER)";
                $ex_libs_dep .= " \$(O_FIPSCANISTER)" if $fipscanisterbuild;
                }
@@ -520,6 +536,13 @@ if ($fips)
                }
        }
 
+if ($fipscanisteronly)
+       {
+       $build_targets = "\$(O_FIPSCANISTER) \$(T_EXE)";
+       $libs_dep = "";
+       }
+       
+
 if ($shlib)
        {
        $extra_install= <<"EOF";
@@ -658,13 +681,13 @@ INC=-I\$(INC_D) -I\$(INCL_D)
 APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG)
 LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG)
 SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG)
-LIBS_DEP=\$(O_CRYPTO) \$(O_SSL) $ex_libs_dep
+LIBS_DEP=$libs_dep
 
 #############################################
 EOF
 
 $rules=<<"EOF";
-all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers \$(FIPS_SHA1_EXE) lib exe $ex_build_targets
+all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers \$(FIPS_SHA1_EXE) $build_targets
 
 banner:
 $banner
@@ -852,12 +875,6 @@ foreach (split(/\s+/,$test))
        $tt="\$(OBJ_D)${o}$t${obj}";
        $rules.=&do_link_rule("\$(TEST_D)$o$t$exep",$tt,"\$(LIBS_DEP)","$t_libs \$(EX_LIBS)", $ltype);
        }
-foreach (split(/\s+/,$test))
-       {
-       $t=&bname($_);
-       $tt="\$(OBJ_D)${o}$t${obj}";
-       $rules.=&do_link_rule("\$(TEST_D)$o$t$exep",$tt,"\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
-       }
 
 $defs.=&do_defs("E_SHLIB",$engines . $otherlibs,"\$(ENG_D)",$shlibp);
 
@@ -1022,6 +1039,8 @@ 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;
@@ -1156,10 +1175,14 @@ sub perlasm_compile_target
        {
        my($target,$source,$bname)=@_;
        my($ret);
-
        $bname =~ s/(.*)\.[^\.]$/$1/;
        $ret ="\$(TMP_D)$o$bname.asm: $source\n";
-       $ret.="\t\$(PERL) $source $asmtype \$(CFLAG) >\$\@\n\n";
+       $ret.="\t\$(PERL) $source $asmtype \$(CFLAG) >\$\@\n";
+       if ($cflags =~ /-DOPENSSL_FIPSSYMS/)
+               {
+               $ret .= "\t\$(PERL) util\\fipsas.pl . \$@ norunasm \$(CFLAG)\n";
+               }
+       $ret .= "\n";
        $ret.="$target: \$(TMP_D)$o$bname.asm\n";
        $ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm\n\n";
        return($ret);
@@ -1297,8 +1320,11 @@ sub read_options
                "no-ssl2" => \$no_ssl2,
                "no-ssl3" => \$no_ssl3,
                "no-tlsext" => \$no_tlsext,
+               "no-srp" => \$no_srp,
                "no-cms" => \$no_cms,
                "no-jpake" => \$no_jpake,
+               "no-ec2m" => \$no_ec2m,
+               "no-ec-nistp224-64-gcc-128" => 0,
                "no-err" => \$no_err,
                "no-sock" => \$no_sock,
                "no-krb5" => \$no_krb5,
@@ -1312,7 +1338,7 @@ sub read_options
                        [\$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_aes, \$no_camellia, \$no_seed, \$no_srp],
                "rsaref" => 0,
                "gcc" => \$gcc,
                "debug" => \$debug,
@@ -1329,6 +1355,7 @@ sub read_options
                "no-zlib-dynamic" => 0,
                "fips" => \$fips,
                "fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
+               "fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
                );
 
        if (exists $valid_options{$_})