Remove all remaining traces if PEM_Seal

[openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 454dcd27907e169b904d25d54842f0934d284fb9..f4148ff7cbcef8224312af8557379989a2f2318c 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -139,7 +139,6 @@ and [options] can be one of
        no-ssl3                                 - Skip this version of SSL
        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-engine                               - No engine
@@ -290,11 +289,9 @@ $cflags.=" -DOPENSSL_NO_DH"   if $no_dh;
 $cflags.=" -DOPENSSL_NO_WHIRLPOOL"   if $no_whirlpool;
 $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
 $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;
 $cflags.=" -DOPENSSL_NO_EC"   if $no_ec;
 $cflags.=" -DOPENSSL_NO_GOST" if $no_gost;
 $cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;
@@ -381,23 +378,24 @@ for (;;)
                $dir=$val;
                }
 
-       if ($key eq "KRB5_INCLUDES")
-               { $cflags .= " $val";}
-
        if ($key eq "ZLIB_INCLUDE")
                { $cflags .= " $val" if $val ne "";}
 
        if ($key eq "LIBZLIB")
                { $zlib_lib = "$val" if $val ne "";}
 
-       if ($key eq "LIBKRB5")
-               { $ex_libs .= " $val" if $val ne "";}
-
        if ($key eq "EX_LIBS")
                { $ex_libs .= " $val" if $val ne "";}
 
-       if ($key =~ /^[A-Z0-9_]*TEST$/ && (!$fipscanisteronly || $dir =~ /^fips/ ))
-               { $test.=&var_add($dir,$val, 0); }
+       # There was a condition here before:
+       #       !$fipscanisteronly || $dir =~ /^fips/
+       # It currently fills no function and needs to be rewritten anyway, so
+       # removed for now.
+       if ($dir eq "test" && $key eq "EXE")
+               {
+               foreach my $t (split /\s+/, $val) {
+                       $test.=&var_add($dir,$t, 0) if $t; }
+               }
 
        if ($key eq "EXE_OBJ")
                { $e_exe.=&var_add($dir,$val, 0); }
@@ -614,7 +612,7 @@ $defs= <<"EOF";
 # N.B. You MUST use -j on FreeBSD.
 # This makefile has been automatically generated from the OpenSSL distribution.
 # This single makefile will build the complete OpenSSL distribution and
-# by default leave the 'intertesting' output files in .${o}out and the stuff
+# by default leave the 'interesting' output files in .${o}out and the stuff
 # that needs deleting in .${o}tmp.
 # The file was generated by running 'make makefile.one', which
 # does a 'make files', which writes all the environment variables from all
@@ -754,7 +752,9 @@ headers: \$(HEADER)
 
 lib: \$(LIBS_DEP) \$(E_SHLIB)
 
-exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
+exe: apps testapps
+apps: \$(BIN_D)$o\$(E_EXE)$exep
+testapps: \$(T_EXE)
 
 install: all
        \$(MKDIR) \"\$(INSTALLTOP)\"
@@ -779,15 +779,8 @@ reallyclean:
 
 EOF
 
-if ($orig_platform ne 'copy')
-       {
-        $rules .= <<"EOF";
-test: \$(T_EXE)
-       cd \$(BIN_D)
-       ..${o}ms${o}test
-
-EOF
-       }
+$rules .= &do_rehash_rule("rehash.time", "certs apps");
+$rules .= &do_test_rule("test", "rehash.time", "run_tests.pl");
 
 my $platform_cpp_symbol = "MK1MF_PLATFORM_$platform";
 $platform_cpp_symbol =~ s/-/_/g;
@@ -1006,8 +999,6 @@ if ($fips)
 
 $rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)", ($fips && !$shlib) ? 2 : 0);
 
-$rules .= get_tests('test/Makefile') if $orig_platform eq 'copy';
-
 print $defs;
 
 if ($platform eq "linux-elf") {
@@ -1086,8 +1077,7 @@ sub var_add
        @a=grep(!/(rmd)|(ripemd)/,@a) if $no_ripemd;
 
        @a=grep(!/(^d2i_r_)|(^i2d_r_)/,@a) if $no_rsa;
-       @a=grep(!/(^p_open$)|(^p_seal$)/,@a) if $no_rsa;
-       @a=grep(!/(^pem_seal$)/,@a) if $no_rsa;
+       @a=grep(!/(^p_open$)/,@a) if $no_rsa;
 
        @a=grep(!/(m_dss$)|(m_dss1$)/,@a) if $no_dsa;
        @a=grep(!/(^d2i_s_)|(^i2d_s_)|(_dsap$)/,@a) if $no_dsa;
@@ -1392,7 +1382,6 @@ sub read_options
                "gaswin" => \$gaswin,
                "no-ssl3" => \$no_ssl3,
                "no-ssl3-method" => 0,
-               "no-tlsext" => \$no_tlsext,
                "no-srp" => \$no_srp,
                "no-cms" => \$no_cms,
                "no-jpake" => \$no_jpake,
@@ -1400,7 +1389,6 @@ sub read_options
                "no-ec_nistp_64_gcc_128" => 0,
                "no-err" => \$no_err,
                "no-sock" => \$no_sock,
-               "no-krb5" => \$no_krb5,
                "no-ec" => \$no_ec,
                "no-gost" => \$no_gost,
                "no-engine" => \$no_engine,
@@ -1487,22 +1475,6 @@ sub read_options
                $xcflags="-DOPENSSL_EXPERIMENTAL_$ALGO $xcflags";
                
                }
-       elsif (/^--with-krb5-flavor=(.*)$/)
-               {
-               my $krb5_flavor = $1;
-               if ($krb5_flavor =~ /^force-[Hh]eimdal$/)
-                       {
-                       $xcflags="-DKRB5_HEIMDAL $xcflags";
-                       }
-               elsif ($krb5_flavor =~ /^MIT/i)
-                       {
-                       $xcflags="-DKRB5_MIT $xcflags";
-                       if ($krb5_flavor =~ /^MIT[._-]*1[._-]*[01]/i)
-                               {
-                               $xcflags="-DKRB5_MIT_OLD11 $xcflags"
-                               }
-                       }
-               }
        elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }
        elsif (/^-[lL].*$/)     { $l_flags.="$_ "; }
        elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/)