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

Update some scripts to use fips-1.0

Browse Source
This commit is contained in:
Dr. Stephen Henson 2006-01-30 18:51:36 +00:00
parent b7508d8396
commit 172bb3734a
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/mk1mf.pl
View File

@ -632,13 +632,13 @@ $rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');
if ($fips && $fips_canister_build) if ($fips && $fips_canister_build)
{ {
$rules.=&cc_compile_target("\$(OBJ_D)${o}fips_start$obj", $rules.=&cc_compile_target("\$(OBJ_D)${o}fips_start$obj",
"fips${o}fips_canister.c", "-DFIPS_START \$(SHLIB_CFLAGS)"); "fips-1.0${o}fips_canister.c", "-DFIPS_START \$(SHLIB_CFLAGS)");
$rules.=&cc_compile_target("\$(OBJ_D)${o}fips_end$obj", $rules.=&cc_compile_target("\$(OBJ_D)${o}fips_end$obj",
"fips${o}fips_canister.c", "\$(SHLIB_CFLAGS)"); "fips-1.0${o}fips_canister.c", "\$(SHLIB_CFLAGS)");
$rules.=&cc_compile_target("\$(OBJ_D)${o}fips_standalone_sha1$obj", $rules.=&cc_compile_target("\$(OBJ_D)${o}fips_standalone_sha1$obj",
"fips${o}sha${o}fips_standalone_sha1.c", "\$(SHLIB_CFLAGS)"); "fips-1.0${o}sha${o}fips_standalone_sha1.c", "\$(SHLIB_CFLAGS)");
$rules.=&cc_compile_target("\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj", $rules.=&cc_compile_target("\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj",
"fips${o}fips_premain.c", "fips-1.0${o}fips_premain.c",
"-DFINGERPRINT_PREMAIN_DSO_LOAD \$(SHLIB_CFLAGS)"); "-DFINGERPRINT_PREMAIN_DSO_LOAD \$(SHLIB_CFLAGS)");
} }
@ -727,7 +727,7 @@ if ($fips)
$rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)", $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
"\$(O_CRYPTO)",$crypto,$shlib, "\$(SO_CRYPTO)", "\$(O_CRYPTO)",$crypto,$shlib, "\$(SO_CRYPTO)",
"0xFB00000", "\$(FIPSLIB_D)$o\$(E_PREMAIN_DSO)$exep", "0xFB00000", "\$(FIPSLIB_D)$o\$(E_PREMAIN_DSO)$exep",
"fips${o}fips_premain.c"); "\$(FIPSLIB_D)${o}fips_premain.c");
} }
else else
{ {

2
util/mkdef.pl
View File

@ -267,7 +267,7 @@ $crypto.=" crypto/ocsp/ocsp.h";
$crypto.=" crypto/ui/ui.h crypto/ui/ui_compat.h"; $crypto.=" crypto/ui/ui.h crypto/ui/ui_compat.h";
$crypto.=" crypto/krb5/krb5_asn.h"; $crypto.=" crypto/krb5/krb5_asn.h";
$crypto.=" crypto/tmdiff.h"; $crypto.=" crypto/tmdiff.h";
$crypto.=" fips/fips.h fips/rand/fips_rand.h"; $crypto.=" fips-1.0/fips.h fips-1.0/rand/fips_rand.h";
my $symhacks="crypto/symhacks.h"; my $symhacks="crypto/symhacks.h";

4
util/mkerr.pl
View File

@ -44,8 +44,8 @@ while (@ARGV) {
} }
if($recurse) { if($recurse) {
@source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>, <fips/*.c>, @source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>, <fips-1.0/*.c>,
<fips/*/*.c>); <fips-1.0/*/*.c>);
} else { } else {
@source = @ARGV; @source = @ARGV;
} }

18
util/mkfiles.pl
View File

@ -51,15 +51,15 @@ my @dirs = (
"crypto/ocsp", "crypto/ocsp",
"crypto/ui", "crypto/ui",
"crypto/krb5", "crypto/krb5",
"fips", "fips-1.0",
"fips/aes", "fips-1.0/aes",
"fips/des", "fips-1.0/des",
"fips/dsa", "fips-1.0/dsa",
"fips/dh", "fips-1.0/dh",
"fips/hmac", "fips-1.0/hmac",
"fips/rand", "fips-1.0/rand",
"fips/rsa", "fips-1.0/rsa",
"fips/sha", "fips-1.0/sha",
"ssl", "ssl",
"apps", "apps",
"test", "test",

4
util/pl/VC-32-GMAKE.pl
View File

@ -212,10 +212,10 @@ sub do_rlink_rule
$file =~ s/\//$o/g if $o ne '/'; $file =~ s/\//$o/g if $o ne '/';
$n=&bname($targer); $n=&bname($targer);
$ret.="$target: $check_hash $files $deps\n"; $ret.="$target: $check_hash $files $deps\n";
$ret.="\t\$(PERL) util${o}checkhash.pl -chdir fips -program_path ..$o$check_hash\n"; $ret.="\t\$(PERL) util${o}checkhash.pl -chdir fips-1.0 -program_path ..$o$check_hash\n";
$ret.="\t\$(MKCANISTER) $target $files\n"; $ret.="\t\$(MKCANISTER) $target $files\n";
$ret.="\t$check_hash $target > $target.sha1\n"; $ret.="\t$check_hash $target > $target.sha1\n";
$ret.="\t\$(CP) fips${o}fips_premain.c \$(FIPSLIB_D)\n"; $ret.="\t\$(CP) fips-1.0${o}fips_premain.c \$(FIPSLIB_D)\n";
$ret.="\t$check_hash \$(FIPSLIB_D)${o}fips_premain.c > \$(FIPSLIB_D)${o}fips_premain.c.sha1\n\n"; $ret.="\t$check_hash \$(FIPSLIB_D)${o}fips_premain.c > \$(FIPSLIB_D)${o}fips_premain.c.sha1\n\n";
return($ret); return($ret);
} }