Generate SHA1 files on Windows and other platforms supported by

mk1mf.pl, when building in FIPS mode.

Note: UNTESTED!

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index ea585d8042a8147adf83c8ded69ec5b9f8f2eece..957264c6b54b4588aea79fb95b7be152bb28155d 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -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") {

diff --git a/util/pl/BC-16.pl b/util/pl/BC-16.pl
index 7f4e0e7d5e6b5ebe90cad6aeb9a38400caaff5a0..8030653daad5051b9c6d59fa8f684755943b2ee0 100644 (file)
--- a/util/pl/BC-16.pl
+++ b/util/pl/BC-16.pl
@@ -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);
        }
 

diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index fe9f4ca9e7cdf13c388a2fad756c01902ed53ccc..897ae9d8249c1fc44a9f32a7a25787f39271d21f 100644 (file)
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -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);
        }
 

diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl
index bfbcb58bf64843385d69c4232220e4867352c7c1..b9bb24d21d7028086aec12ba9b5db99d3eddd7c5 100644 (file)
--- a/util/pl/Mingw32.pl
+++ b/util/pl/Mingw32.pl
@@ -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;

diff --git a/util/pl/OS2-EMX.pl b/util/pl/OS2-EMX.pl
index 009417acc7344bf87c59a485b5a86ecae6c4b47b..75d72ebbcbda0809fad621dcca74510bee3aba11 100644 (file)
--- a/util/pl/OS2-EMX.pl
+++ b/util/pl/OS2-EMX.pl
@@ -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);
        }
 

diff --git a/util/pl/VC-16.pl b/util/pl/VC-16.pl
index af348fa134767ed01941416163a7f817e1094c8f..564ba3fd08baceff571822a591cb6d370ffc8e82 100644 (file)
--- a/util/pl/VC-16.pl
+++ b/util/pl/VC-16.pl
@@ -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);
        }
 

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 85e3d8da505b1a883be812a73616fb34305b177f..516b9a7bf55712ab0e8d3e71acc92844c65a73b2 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -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);
        }
 

diff --git a/util/pl/VC-CE.pl b/util/pl/VC-CE.pl
index 062c6a439508eeb60acf49b3c57ca71691dd996f..2fd0c4dd32decfb994180fd9e90c16274598bc28 100644 (file)
--- a/util/pl/VC-CE.pl
+++ b/util/pl/VC-CE.pl
@@ -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);
        }
 

diff --git a/util/pl/linux.pl b/util/pl/linux.pl
index 8924ed54808a12a491bc1ed9e6e874d825563cfb..df05c40526e74203f58d53210e4d18623b7ecc21 100644 (file)
--- a/util/pl/linux.pl
+++ b/util/pl/linux.pl
@@ -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);
        }
 

diff --git a/util/pl/ultrix.pl b/util/pl/ultrix.pl
index d88e8b982768f61e955546c8fde8d4740583338b..447b8547080c78f28373c06fecc1ec92f9b0a0c0 100644 (file)
--- a/util/pl/ultrix.pl
+++ b/util/pl/ultrix.pl
@@ -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);
        }
 

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 146611ad99586edac881f7f199a745271130850f..bbd1798a2e5e992704afbe495789206b0dc63000 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -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);
        }