diff options
| -rw-r--r-- | Configurations/00-base-templates.conf | 2 | ||||
| -rw-r--r-- | Configurations/README | 3 | ||||
| -rwxr-xr-x | Configure | 2 | ||||
| -rw-r--r-- | crypto/cast/build.info | 16 |
4 files changed, 14 insertions, 9 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 1bd7541..f67fbc2 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -14,7 +14,6 @@ my %targets=( thread_scheme => "(unknown)", # Assume we don't know thread_defines => [], - cast_asm_src => "c_enc.c", rc4_asm_src => "rc4_enc.c rc4_skey.c", rmd160_asm_src => "", rc5_asm_src => "rc5_enc.c", @@ -161,7 +160,6 @@ my %targets=( x86_asm => { template => 1, - cast_asm_src => "cast-586.s", rc4_asm_src => "rc4-586.s", rmd160_asm_src => "rmd-586.s", rc5_asm_src => "rc5-586.s", diff --git a/Configurations/README b/Configurations/README index 0d6e5ee..773235e 100644 --- a/Configurations/README +++ b/Configurations/README @@ -240,9 +240,6 @@ In each table entry, the following keys are significant: export vars as accessor functions. - cast_asm_src => Assembler implementation of core CAST - functions. - Defaults to 'c_enc.c' rc4_asm_src => Assembler implementation of core RC4 functions. Defaults to 'rc4_enc.c rc4_skey.c' @@ -1410,7 +1410,6 @@ unless ($disabled{asm}) { if ($target{rc4_asm_src} ne $table{DEFAULTS}->{rc4_asm_src}) { push @{$config{lib_defines}}, "RC4_ASM"; } - $target{cast_asm_src}=$table{DEFAULTS}->{cast_asm_src} unless $disabled{pic}; # CAST assembler is not PIC if ($target{rmd160_asm_src}) { push @{$config{lib_defines}}, "RMD160_ASM"; } @@ -3358,7 +3357,6 @@ sub print_table_entry "loutflag", "ex_libs", "bn_ops", - "cast_asm_src", "rc4_asm_src", "rmd160_asm_src", "rc5_asm_src", diff --git a/crypto/cast/build.info b/crypto/cast/build.info index b0f59f3..97779c2 100644 --- a/crypto/cast/build.info +++ b/crypto/cast/build.info @@ -1,6 +1,18 @@ LIBS=../../libcrypto -SOURCE[../../libcrypto]=\ - c_skey.c c_ecb.c {- $target{cast_asm_src} -} c_cfb64.c c_ofb64.c + +$CASTASM=c_enc.c +# CAST assembly source is not PIC +IF[{- !$disabled{asm} && !$disabled{pic} -}] + $CASTASM_x86=cast-586.s + + # Now that we have defined all the arch specific variables, use the + # appropriate one + IF[$CASTASM_{- $target{asm_arch} -}] + $CASTASM=$CASTASM_{- $target{asm_arch} -} + ENDIF +ENDIF + +SOURCE[../../libcrypto]=c_skey.c c_ecb.c $CASTASM c_cfb64.c c_ofb64.c GENERATE[cast-586.s]=asm/cast-586.pl \ $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) |