Generate SHA1 files on Windows and other platforms supported by

mk1mf.pl, when building in FIPS mode.

Note: UNTESTED!
This commit is contained in:
Richard Levitte
2004-05-17 04:28:31 +00:00
parent 9ac9a29407
commit 63d494b22c
11 changed files with 81 additions and 25 deletions

View File

@@ -632,8 +632,14 @@ foreach (split(/\s+/,$test))
$rules.= &do_lib_rule("\$(SSLOBJ)","\$(O_SSL)",$ssl,$shlib,"\$(SO_SSL)");
$rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)");
$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
if ($fips)
{
$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)","\$(BIN_D)$o.sha1","\$(BIN_D)$o\$(E_EXE)$exep");
}
else
{
$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
}
print $defs;
if ($platform eq "linux-elf") {

View File

@@ -119,11 +119,11 @@ sub do_lib_rule
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
local($ret,$f,$_,@f);
$file =~ s/\//$o/g if $o ne '/';
$n=&bname($targer);
$n=&bname($target);
$ret.="$target: $files $dep_libs\n";
$ret.=" \$(LINK) @&&|";
@@ -139,7 +139,12 @@ sub do_link_rule
}
else
{ $ret.="\n $r \$(APP_EX_OBJ) $files\n"; }
$ret.=" $target\n\n $libs\n\n|\n\n";
$ret.=" $target\n\n $libs\n\n|\n";
if (defined $sha1file)
{
$ret.=" $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
}
$ret.="\n";
return($ret);
}

View File

@@ -122,13 +122,18 @@ sub do_lib_rule
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
$n=&bname($targer);
$ret.="$target: $files $dep_libs\n";
$ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n";
$ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n";
if (defined $sha1file)
{
$ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
}
$ret.="\n";
return($ret);
}

View File

@@ -92,13 +92,18 @@ sub do_lib_rule
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
$n=&bname($target);
$ret.="$target: $files $dep_libs\n";
$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n";
if (defined $sha1file)
{
$ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
}
$ret.="\n";
return($ret);
}
1;

View File

@@ -106,13 +106,18 @@ sub do_lib_rule
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
$n=&bname($target);
$ret.="$target: $files $dep_libs\n";
$ret.="\t\$(LINK) ${efile}$target \$(CFLAG) \$(LFLAGS) $files $libs\n\n";
$ret.="\t\$(LINK) ${efile}$target \$(CFLAG) \$(LFLAGS) $files $libs\n";
if (defined $sha1file)
{
$ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
}
$ret.="\n";
return($ret);
}

View File

@@ -147,7 +147,7 @@ sub do_lib_rule
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
local($ret,$f,$_,@f);
$file =~ s/\//$o/g if $o ne '/';
@@ -165,7 +165,12 @@ sub do_link_rule
}
else
{ $ret.=" \$(APP_EX_OBJ) $files"; }
$ret.="\n $target\n\n $libs\n\n<<\n\n";
$ret.="\n $target\n\n $libs\n\n<<\n";
if (defined $sha1file)
{
$ret.=" $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
}
$ret.="\n";
return($ret);
}

View File

@@ -126,14 +126,19 @@ sub do_lib_rule
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
$n=&bname($targer);
$ret.="$target: $files $dep_libs\n";
$ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n";
$ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n\n";
$ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n";
if (defined $sha1file)
{
$ret.=" $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
}
$ret.="\n";
return($ret);
}

View File

@@ -97,14 +97,19 @@ sub do_lib_rule
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
$n=&bname($targer);
$ret.="$target: $files $dep_libs\n";
$ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n";
$ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n\n";
$ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n";
if (defined $sha1file)
{
$ret.=" $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
}
$ret.="\n";
return($ret);
}

View File

@@ -72,13 +72,18 @@ sub do_shlib_rule
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
$n=&bname($target);
$ret.="$target: $files $dep_libs\n";
$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n";
if (defined $sha1file)
{
$ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
}
$ret.="\n";
return($ret);
}

View File

@@ -25,13 +25,18 @@ if (!$no_asm && !$fips)
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
$n=&bname($target);
$ret.="$target: $files $dep_libs\n";
$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n";
if (defined $sha1file)
{
$ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
}
$ret.="\n";
return($ret);
}

View File

@@ -70,13 +70,18 @@ sub do_lib_rule
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
$n=&bname($target);
$ret.="$target: $files $dep_libs\n";
$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n";
if (defined $sha1file)
{
$ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
}
$ret.="\n";
return($ret);
}