Move des_asm_src file information to build.info files

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index d3a78c0850d2411e60832e9b04fa3fd44dfbb905..d088363d84e4be5d3475dce747aa764876465d88 100644 (file)
--- 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  => [],
 
-       des_asm_src     => "des_enc.c fcrypt_b.c",
        aes_asm_src     => "aes_core.c aes_cbc.c",
        bf_asm_src      => "bf_enc.c",
        md5_asm_src     => "",
@@ -165,7 +164,6 @@ my %targets=(
 
     x86_asm => {
        template        => 1,
-       des_asm_src     => "des-586.s crypt586.s",
        aes_asm_src     => "aes-586.s vpaes-x86.s aesni-x86.s",
        bf_asm_src      => "bf-586.s",
        md5_asm_src     => "md5-586.s",
@@ -209,7 +207,6 @@ my %targets=(
     },
     sparcv9_asm => {
        template        => 1,
-       des_asm_src     => "des_enc-sparc.S fcrypt_b.c dest4-sparcv9.S",
        aes_asm_src     => "aes_core.c aes_cbc.c aes-sparcv9.S aest4-sparcv9.S aesfx-sparcv9.S",
        md5_asm_src     => "md5-sparcv9.S",
        sha1_asm_src    => "sha1-sparcv9.S sha256-sparcv9.S sha512-sparcv9.S",
@@ -219,7 +216,6 @@ my %targets=(
     },
     sparcv8_asm => {
        template        => 1,
-       des_asm_src     => "des_enc-sparc.S fcrypt_b.c",
     },
     alpha_asm => {
        template        => 1,

diff --git a/Configurations/README b/Configurations/README
index f5be5a8d6569110abc97d6abf835e7594d0de6dd..2cdd3511d2d9b209c4f3da522ddd8b93b8b51add 100644 (file)
--- a/Configurations/README
+++ b/Configurations/README
@@ -240,9 +240,6 @@ In each table entry, the following keys are significant:
                                                 export vars as
                                                 accessor functions.
 
-        des_asm_src     => Assembler implementation of core DES
-                           encryption functions.
-                           Defaults to 'des_enc.c fcrypt_b.c'
         aes_asm_src     => Assembler implementation of core AES
                            functions.
                            Defaults to 'aes_core.c aes_cbc.c'

diff --git a/Configure b/Configure
index 64bb655f5271c2404b1d8cc40d3d8b873ce92290..85c9b92a1f99e38cec23fa6d7f25e43278c4e63a 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -3392,7 +3392,6 @@ sub print_table_entry
         "loutflag",
         "ex_libs",
         "bn_ops",
-        "des_asm_src",
         "aes_asm_src",
         "bf_asm_src",
         "md5_asm_src",

diff --git a/crypto/des/build.info b/crypto/des/build.info
index 05cb154cd46273f8082d9e38b30756ba7b9e9508..474d14e229491d2b60945dcce786f671a98c1bec 100644 (file)
--- a/crypto/des/build.info
+++ b/crypto/des/build.info
@@ -1,10 +1,24 @@
+$DESASM=des_enc.c fcrypt_b.c
+IF[{- !$disabled{asm} -}]
+  $DESASM_x86=des-586.s crypt586.s
+  $DESASM_ia64=ghash-ia64.s
+  $DESASM_sparcv9=des_enc-sparc.S fcrypt_b.c dest4-sparcv9.S
+  $DESASM_sparcv8=des_enc-sparc.S fcrypt_b.c
+
+  # Now that we have defined all the arch specific variables, use the
+  # appropriate one
+  IF[$DESASM_{- $target{asm_arch} -}]
+    $DESASM=$DESASM_{- $target{asm_arch} -}
+  ENDIF
+ENDIF
+
 LIBS=../../libcrypto
 SOURCE[../../libcrypto]=\
         set_key.c  ecb_enc.c  cbc_enc.c \
         ecb3_enc.c cfb64enc.c cfb64ede.c cfb_enc.c \
         ofb64ede.c ofb64enc.c ofb_enc.c \
         str2key.c  pcbc_enc.c qud_cksm.c rand_key.c \
-        {- $target{des_asm_src} -} \
+        $DESASM \
         fcrypt.c xcbc_enc.c cbc_cksm.c
 
 GENERATE[des_enc-sparc.S]=asm/des_enc.m4