GH355: Implement HKDF

[openssl.git] / util / pl / BC-32.pl

diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index c22acecfdd441aed3bfc0f7d2886c33f21808c73..57384bba1e7c1df9d04da882af33c237c8857a27 100644 (file)
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -99,9 +99,6 @@ sub do_rehash_rule {
     my ($target, $deps) = @_;
     my $ret = <<"EOF";
 $target: $deps
-       set OPENSSL=\$(BIN_D)${o}openssl.exe
-       set OPENSSL_DEBUG_MEMORY=on
-       \$(PERL) \$(BIN_D)${o}c_rehash certs/demo
        echo off > $target
 EOF
     return $ret
@@ -114,7 +111,7 @@ $target: $deps force.$target
        set BIN_D=\$(BIN_D)
        set TEST_D=\$(TEST_D)
        set PERL=\$(PERL)
-       \$(PERL) test\\$test_cmd
+       \$(PERL) test\\$test_cmd \$(TESTS)
 force.$target:
 EOF
 }
@@ -143,7 +140,7 @@ ___
                {
                local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
                $ex.=' ws2_32.lib gdi32.lib';
-               $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
+               $ret.="\t\$(LINK_CMD) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
                }
        $ret.="\n";
        return($ret);
@@ -157,7 +154,7 @@ sub do_link_rule
        $file =~ s/\//$o/g if $o ne '/';
        $n=&bname($target);
        $ret.="$target: $files $dep_libs\n";
-       $ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n";
+       $ret.="\t\$(LINK_CMD) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n";
        return($ret);
        }