generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Strip CRs when installing fips_premain.c Correct compat library rule

Browse Source 
in FIPS mode.
This commit is contained in:
Dr. Stephen Henson 2011-06-18 17:18:25 +00:00
parent 6cdcb92513
commit 0b41fcc2cb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/mk1mf.pl
View File

@ -542,6 +542,8 @@ if ($fipscanisteronly)
$libs_dep = ""; $libs_dep = "";
} }
$cp2 = $cp unless defined $cp2;
$extra_install= <<"EOF"; $extra_install= <<"EOF";
\$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\" \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
\$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\" \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"
@ -554,7 +556,7 @@ if ($fipscanisteronly)
$extra_install = <<"EOF"; $extra_install = <<"EOF";
\$(CP) \"\$(O_FIPSCANISTER)\" \"\$(INSTALLTOP)${o}lib\" \$(CP) \"\$(O_FIPSCANISTER)\" \"\$(INSTALLTOP)${o}lib\"
\$(CP) \"\$(O_FIPSCANISTER).sha1\" \"\$(INSTALLTOP)${o}lib\" \$(CP) \"\$(O_FIPSCANISTER).sha1\" \"\$(INSTALLTOP)${o}lib\"
\$(CP) \"fips${o}fips_premain.c\" \"\$(INSTALLTOP)${o}lib\" \$(CP2) \"fips${o}fips_premain.c\" \"\$(INSTALLTOP)${o}lib\"
\$(CP) \"fips${o}fips_premain.c.sha1\" \"\$(INSTALLTOP)${o}lib\" \$(CP) \"fips${o}fips_premain.c.sha1\" \"\$(INSTALLTOP)${o}lib\"
\$(CP) \"\$(INCO_D)${o}fips.h\" \"\$(INSTALLTOP)${o}include${o}openssl\" \$(CP) \"\$(INCO_D)${o}fips.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
\$(CP) \"\$(INCO_D)${o}fips_rand.h\" \"\$(INSTALLTOP)${o}include${o}openssl\" \$(CP) \"\$(INCO_D)${o}fips_rand.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
@ -640,6 +642,7 @@ INCO_D=$inc_dir${o}openssl
PERL=$perl PERL=$perl
CP=$cp CP=$cp
CP2=$cp2
RM=$rm RM=$rm
RANLIB=$ranlib RANLIB=$ranlib
MKDIR=$mkdir MKDIR=$mkdir
@ -924,7 +927,7 @@ if ($fips)
{ {
$rules.= &do_lib_rule("\$(CRYPTOOBJ)", $rules.= &do_lib_rule("\$(CRYPTOOBJ)",
"\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)", ""); "\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)", "");
$rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(FIPSOBJ)", $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
"\$(LIB_D)$o$crypto_compat",$crypto,$shlib,"\$(SO_CRYPTO)", ""); "\$(LIB_D)$o$crypto_compat",$crypto,$shlib,"\$(SO_CRYPTO)", "");
} }
} }

1
util/pl/VC-32.pl
View File

@ -23,6 +23,7 @@ if ($fipscanisterbuild)
$o='\\'; $o='\\';
$cp='$(PERL) util/copy.pl'; $cp='$(PERL) util/copy.pl';
$cp2='$(PERL) util/copy.pl -stripcr';
$mkdir='$(PERL) util/mkdir-p.pl'; $mkdir='$(PERL) util/mkdir-p.pl';
$rm='del /Q'; $rm='del /Q';