diff options
author | Richard Levitte <levitte@openssl.org> | 2016-01-25 21:51:22 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-01-25 21:51:22 +0100 |
commit | f0bd4686758ea13ae5f05b8c43a0903344f89148 (patch) | |
tree | 8d3e086ca63bbcbe9335c904da45d6a36a2fc16d | |
parent | 9ab6fc5936be62f6fee1c433938eae4c89aa23da (diff) | |
download | openssl-f0bd4686758ea13ae5f05b8c43a0903344f89148.tar.gz |
Small cleanups in Configure
- Small rearrangement of the TABLE and HASH printouts, and adding
printout of the "build_scheme" item
- Renamed "engines_obj" to "padlock_obj"
- Moved the runs of dofile down... it didn't quite make sense to have
that in the middle of a printout
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r-- | Configurations/00-base-templates.conf | 6 | ||||
-rw-r--r-- | Configurations/90-team.conf | 2 | ||||
-rw-r--r-- | Configurations/README | 4 | ||||
-rwxr-xr-x | Configure | 35 |
4 files changed, 25 insertions, 22 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index c5ff592e33..2ff2c2a3e9 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -15,7 +15,7 @@ wp_obj => "wp_block.o", cmll_obj => "camellia.o cmll_misc.o cmll_cbc.o", modes_obj => "", - engines_obj => "", + padlock_obj => "", chacha_obj => "chacha_enc.o", poly1305_obj => "", @@ -43,7 +43,7 @@ wp_obj => "wp_block.o wp-mmx.o", cmll_obj => "cmll-x86.o", modes_obj => "ghash-x86.o", - engines_obj => "e_padlock-x86.o" + padlock_obj => "e_padlock-x86.o" }, x86_elf_asm => { template => 1, @@ -62,7 +62,7 @@ wp_obj => "wp-x86_64.o", cmll_obj => "cmll-x86_64.o cmll_misc.o", modes_obj => "ghash-x86_64.o aesni-gcm-x86_64.o", - engines_obj => "e_padlock-x86_64.o" + padlock_obj => "e_padlock-x86_64.o" }, ia64_asm => { template => 1, diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf index 76dd1b7329..bf27587da0 100644 --- a/Configurations/90-team.conf +++ b/Configurations/90-team.conf @@ -82,7 +82,7 @@ rc5_obj => "rc5-586.o", wp_obj => "wp_block.o wp-mmx.o", modes_obj => "ghash-x86.o", - engines_obj => "e_padlock-x86.o", + padlock_obj => "e_padlock-x86.o", perlasm_scheme => "elf", dso_scheme => "dlfcn", shared_target => "linux-shared", diff --git a/Configurations/README b/Configurations/README index 2faf89630b..c4a741361e 100644 --- a/Configurations/README +++ b/Configurations/README @@ -225,7 +225,7 @@ In each table entry, the following keys are significant: Defaults to 'camellia.o cmll_misc.o cmll_cbc.o' modes_obj => assembler implementation of the functions gcm_gmult_4bit and gcm_ghash_4bit. - engines_obj => assembler implementation of core parts of + padlock_obj => assembler implementation of core parts of the padlock engine. This is mandatory on any platform where the padlock engine might actually be built. @@ -293,4 +293,4 @@ Historically, the target configurations came in form of a string with values separated by colons. This use is deprecated. The string form looked like this: - "target" => "{cc}:{cflags}:{unistd}:{thread_cflag}:{sys_id}:{lflags}:{bn_ops}:{cpuid_obj}:{bn_obj}:{ec_obj}:{des_obj}:{aes_obj}:{bf_obj}:{md5_obj}:{sha1_obj}:{cast_obj}:{rc4_obj}:{rmd160_obj}:{rc5_obj}:{wp_obj}:{cmll_obj}:{modes_obj}:{engines_obj}:{perlasm_scheme}:{dso_scheme}:{shared_target}:{shared_cflag}:{shared_ldflag}:{shared_extension}:{ranlib}:{arflags}:{multilib}" + "target" => "{cc}:{cflags}:{unistd}:{thread_cflag}:{sys_id}:{lflags}:{bn_ops}:{cpuid_obj}:{bn_obj}:{ec_obj}:{des_obj}:{aes_obj}:{bf_obj}:{md5_obj}:{sha1_obj}:{cast_obj}:{rc4_obj}:{rmd160_obj}:{rc5_obj}:{wp_obj}:{cmll_obj}:{modes_obj}:{padlock_obj}:{perlasm_scheme}:{dso_scheme}:{shared_target}:{shared_cflag}:{shared_ldflag}:{shared_extension}:{ranlib}:{arflags}:{multilib}" @@ -1346,25 +1346,14 @@ print "SHA1_OBJ_ASM =$target{sha1_obj}\n"; print "RMD160_OBJ_ASM=$target{rmd160_obj}\n"; print "CMLL_ENC =$target{cmll_obj}\n"; print "MODES_OBJ =$target{modes_obj}\n"; -print "ENGINES_OBJ =$target{engines_obj}\n"; +print "PADLOCK_OBJ =$target{padlock_obj}\n"; print "CHACHA_ENC =$target{chacha_obj}\n"; print "POLY1305_OBJ =$target{poly1305_obj}\n"; print "PROCESSOR =$config{processor}\n"; print "RANLIB =$target{ranlib}\n"; print "ARFLAGS =$target{arflags}\n"; print "PERL =$config{perl}\n"; - -run_dofile("$Makefile.in","$Makefile"); - -run_dofile("include/openssl/opensslconf.h.in", "include/openssl/opensslconf.h"); - -foreach my $alg ( 'bf', 'bn', 'des', 'rc4' ) { - run_dofile("crypto/include/internal/${alg}_conf.h.in", - "crypto/include/internal/${alg}_conf.h"); -} - -# Fix the date - +print "\n"; print "SIXTY_FOUR_BIT_LONG mode\n" if $config{b64l}; print "SIXTY_FOUR_BIT mode\n" if $config{b64}; print "THIRTY_TWO_BIT mode\n" if $config{b32}; @@ -1386,6 +1375,15 @@ print "RC2 uses $config{rc2_int}\n" if $config{rc2_int} != $def_int; print "BF_PTR used\n" if $config{bf_ptr} == 1; print "BF_PTR2 used\n" if $config{bf_ptr} == 2; +run_dofile("$Makefile.in","$Makefile"); + +run_dofile("include/openssl/opensslconf.h.in", "include/openssl/opensslconf.h"); + +foreach my $alg ( 'bf', 'bn', 'des', 'rc4' ) { + run_dofile("crypto/include/internal/${alg}_conf.h.in", + "crypto/include/internal/${alg}_conf.h"); +} + # Copy all Makefile.in to Makefile (except top-level) use File::Find; use IO::File; @@ -1769,13 +1767,14 @@ sub print_table_entry return if $target{template}; my @sequence = ( + "sys_id", "cc", "cflags", "debug_cflags", "release_cflags", - "unistd", "thread_cflag", - "sys_id", + "unistd", + "ld", "lflags", "debug_lflags", "release_lflags", @@ -1795,16 +1794,20 @@ sub print_table_entry "wp_obj", "cmll_obj", "modes_obj", - "engines_obj", + "padlock_obj", "perlasm_scheme", "dso_scheme", "shared_target", "shared_cflag", "shared_ldflag", "shared_extension", + "obj_extension", + "exe_extension", "ranlib", + "ar", "arflags", "multilib", + "build_scheme", ); if ($type eq "TABLE") { |