Update some scripts to use fips-1.0

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index dab6664d93942ca6c94aa334c50395fb23fe47c7..2487da5ad1c898be937b856a0f56f8fc5af08b92 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -632,13 +632,13 @@ $rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');
 if ($fips && $fips_canister_build)
        {
        $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",
-               "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",
-               "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",
-               "fips${o}fips_premain.c",
+               "fips-1.0${o}fips_premain.c",
                "-DFINGERPRINT_PREMAIN_DSO_LOAD \$(SHLIB_CFLAGS)");
        }
 
@@ -727,7 +727,7 @@ if ($fips)
                $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
                        "\$(O_CRYPTO)",$crypto,$shlib, "\$(SO_CRYPTO)",
                        "0xFB00000", "\$(FIPSLIB_D)$o\$(E_PREMAIN_DSO)$exep",
-                                       "fips${o}fips_premain.c");
+                                       "\$(FIPSLIB_D)${o}fips_premain.c");
                }
        else
                {

diff --git a/util/mkdef.pl b/util/mkdef.pl
index c4f995fb76e0b0c6cc3cdbbd8f863522d7507cc8..ee44f22af101e98d938f602ec9f0f4ac7d60b4ab 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -267,7 +267,7 @@ $crypto.=" crypto/ocsp/ocsp.h";
 $crypto.=" crypto/ui/ui.h crypto/ui/ui_compat.h";
 $crypto.=" crypto/krb5/krb5_asn.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";
 

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 2fb64e522cf0442cd6c6c82963ba4aa597594e3b..9678514604b5d9568bc2cbb1f5f9f02846c50545 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -44,8 +44,8 @@ while (@ARGV) {
 }
 
 if($recurse) {
-       @source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>, <fips/*.c>,
-                  <fips/*/*.c>);
+       @source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>, <fips-1.0/*.c>,
+                  <fips-1.0/*/*.c>);
 } else {
        @source = @ARGV;
 }

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index a1ac3a9c0cf46cffb3379219800e733e312150d0..bc78510f569d3dbde9867f007a2534da1138ab6c 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -51,15 +51,15 @@ my @dirs = (
 "crypto/ocsp",
 "crypto/ui",
 "crypto/krb5",
-"fips",
-"fips/aes",
-"fips/des",
-"fips/dsa",
-"fips/dh",
-"fips/hmac",
-"fips/rand",
-"fips/rsa",
-"fips/sha",
+"fips-1.0",
+"fips-1.0/aes",
+"fips-1.0/des",
+"fips-1.0/dsa",
+"fips-1.0/dh",
+"fips-1.0/hmac",
+"fips-1.0/rand",
+"fips-1.0/rsa",
+"fips-1.0/sha",
 "ssl",
 "apps",
 "test",

diff --git a/util/pl/VC-32-GMAKE.pl b/util/pl/VC-32-GMAKE.pl
index 9ceba1a998fd4ea7c2846e5f04f082b96d87ac12..0c65aff7522aac473b7ad90ac5836a65de90ef2f 100644 (file)
--- a/util/pl/VC-32-GMAKE.pl
+++ b/util/pl/VC-32-GMAKE.pl
@@ -212,10 +212,10 @@ sub do_rlink_rule
        $file =~ s/\//$o/g if $o ne '/';
        $n=&bname($targer);
        $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$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";
        return($ret);
        }