Skip to content

Commit edc7851

Browse files
levittelevitte
committed
Move sha1_asm_src file information to build.info files
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from openssl#9166)
1 parent 792ea00 commit edc7851

5 files changed

Lines changed: 57 additions & 24 deletions

File tree

‎Configurations/00-base-templates.conf‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ my %targets=(
162162
x86_asm => {
163163
template => 1,
164164
cast_asm_src => "cast-586.s",
165-
sha1_asm_src => "sha1-586.s sha256-586.s sha512-586.s",
166165
rc4_asm_src => "rc4-586.s",
167166
rmd160_asm_src => "rmd-586.s",
168167
rc5_asm_src => "rc5-586.s",
@@ -179,7 +178,6 @@ my %targets=(
179178
},
180179
x86_64_asm => {
181180
template => 1,
182-
sha1_asm_src => "sha1-x86_64.s sha256-x86_64.s sha512-x86_64.s sha1-mb-x86_64.s sha256-mb-x86_64.s",
183181
rc4_asm_src => "rc4-x86_64.s rc4-md5-x86_64.s",
184182
wp_asm_src => "wp-x86_64.s",
185183
cmll_asm_src => "cmll-x86_64.s cmll_misc.c",
@@ -191,14 +189,12 @@ my %targets=(
191189
},
192190
ia64_asm => {
193191
template => 1,
194-
sha1_asm_src => "sha1-ia64.s sha256-ia64.s sha512-ia64.s",
195192
modes_asm_src => "ghash-ia64.s",
196193
chacha_asm_src => "chacha-ia64.S",
197194
poly1305_asm_src=> "asm/poly1305-ia64.S",
198195
},
199196
sparcv9_asm => {
200197
template => 1,
201-
sha1_asm_src => "sha1-sparcv9.S sha256-sparcv9.S sha512-sparcv9.S",
202198
cmll_asm_src => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S",
203199
modes_asm_src => "ghash-sparcv9.S",
204200
poly1305_asm_src=> "poly1305-sparcv9.S",
@@ -208,22 +204,18 @@ my %targets=(
208204
},
209205
alpha_asm => {
210206
template => 1,
211-
sha1_asm_src => "sha1-alpha.S",
212207
modes_asm_src => "ghash-alpha.S",
213208
},
214209
mips32_asm => {
215210
template => 1,
216-
sha1_asm_src => "sha1-mips.S sha256-mips.S",
217211
},
218212
mips64_asm => {
219213
inherit_from => [ "mips32_asm" ],
220214
template => 1,
221-
sha1_asm_src => add("sha512-mips.S"),
222215
poly1305_asm_src=> "poly1305-mips.S",
223216
},
224217
s390x_asm => {
225218
template => 1,
226-
sha1_asm_src => "sha1-s390x.S sha256-s390x.S sha512-s390x.S",
227219
rc4_asm_src => "rc4-s390x.s",
228220
modes_asm_src => "ghash-s390x.S",
229221
chacha_asm_src => "chacha-s390x.S",
@@ -232,23 +224,20 @@ my %targets=(
232224
},
233225
armv4_asm => {
234226
template => 1,
235-
sha1_asm_src => "sha1-armv4-large.S sha256-armv4.S sha512-armv4.S",
236227
modes_asm_src => "ghash-armv4.S ghashv8-armx.S",
237228
chacha_asm_src => "chacha-armv4.S",
238229
poly1305_asm_src=> "poly1305-armv4.S",
239230
keccak1600_asm_src => "keccak1600-armv4.S",
240231
},
241232
aarch64_asm => {
242233
template => 1,
243-
sha1_asm_src => "sha1-armv8.S sha256-armv8.S sha512-armv8.S",
244234
modes_asm_src => "ghashv8-armx.S",
245235
chacha_asm_src => "chacha-armv8.S",
246236
poly1305_asm_src=> "poly1305-armv8.S",
247237
keccak1600_asm_src => "keccak1600-armv8.S",
248238
},
249239
parisc11_asm => {
250240
template => 1,
251-
sha1_asm_src => "sha1-parisc.s sha256-parisc.s sha512-parisc.s",
252241
rc4_asm_src => "rc4-parisc.s",
253242
modes_asm_src => "ghash-parisc.s",
254243
},
@@ -258,7 +247,6 @@ my %targets=(
258247
},
259248
ppc32_asm => {
260249
template => 1,
261-
sha1_asm_src => "sha1-ppc.s sha256-ppc.s sha512-ppc.s sha256p8-ppc.s sha512p8-ppc.s",
262250
modes_asm_src => "ghashp8-ppc.s",
263251
chacha_asm_src => "chacha-ppc.s",
264252
poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s",

‎Configurations/10-main.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,6 @@ my %targets = (
949949
cppflags => combine("-DOPENSSL_SMALL_FOOTPRINT",
950950
threads("-D_REENTRANT")),
951951
bn_ops => "BN_LLONG",
952-
sha1_asm_src => "sha1-c64xplus.s sha256-c64xplus.s sha512-c64xplus.s",
953952
rc4_asm_src => "rc4-c64xplus.s",
954953
modes_asm_src => "ghash-c64xplus.s",
955954
chacha_asm_src => "chacha-c64xplus.s",

‎Configurations/README‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,6 @@ In each table entry, the following keys are significant:
240240
export vars as
241241
accessor functions.
242242

243-
sha1_asm_src => Assembler implementation of core SHA1,
244-
functions, and also possibly SHA256 and
245-
SHA512 ones.
246243
cast_asm_src => Assembler implementation of core CAST
247244
functions.
248245
Defaults to 'c_enc.c'

‎Configure‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,11 +1404,6 @@ if ($target{sys_id} ne "")
14041404
}
14051405

14061406
unless ($disabled{asm}) {
1407-
if ($target{sha1_asm_src}) {
1408-
push @{$config{lib_defines}}, "SHA1_ASM" if ($target{sha1_asm_src} =~ /sx86/ || $target{sha1_asm_src} =~ /sha1/);
1409-
push @{$config{lib_defines}}, "SHA256_ASM" if ($target{sha1_asm_src} =~ /sha256/);
1410-
push @{$config{lib_defines}}, "SHA512_ASM" if ($target{sha1_asm_src} =~ /sha512/);
1411-
}
14121407
if ($target{keccak1600_asm_src} ne $table{DEFAULTS}->{keccak1600_asm_src}) {
14131408
push @{$config{lib_defines}}, "KECCAK1600_ASM";
14141409
}
@@ -3364,7 +3359,6 @@ sub print_table_entry
33643359
"ex_libs",
33653360
"bn_ops",
33663361
"cast_asm_src",
3367-
"sha1_asm_src",
33683362
"rc4_asm_src",
33693363
"rmd160_asm_src",
33703364
"rc5_asm_src",

‎crypto/sha/build.info‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,64 @@
11
LIBS=../../libcrypto
22

3-
$COMMON=sha1dgst.c sha256.c sha512.c sha3.c \
4-
{- $target{sha1_asm_src} -} {- $target{keccak1600_asm_src} -}
3+
$SHA1ASM=
4+
IF[{- !$disabled{asm} -}]
5+
$SHA1ASM_x86=sha1-586.s sha256-586.s sha512-586.s
6+
$SHA1DEF_x86=SHA1_ASM SHA256_ASM SHA512_ASM
7+
$SHA1ASM_x86_64=\
8+
sha1-x86_64.s sha256-x86_64.s sha512-x86_64.s sha1-mb-x86_64.s \
9+
sha256-mb-x86_64.s
10+
$SHA1DEF_x86_64=SHA1_ASM SHA256_ASM SHA512_ASM
11+
12+
$SHA1ASM_ia64=sha1-ia64.s sha256-ia64.s sha512-ia64.s
13+
$SHA1DEF_ia64=SHA1_ASM SHA256_ASM SHA512_ASM
14+
15+
$SHA1ASM_sparcv9=sha1-sparcv9.S sha256-sparcv9.S sha512-sparcv9.S
16+
$SHA1DEF_sparcv9=SHA1_ASM SHA256_ASM SHA512_ASM
17+
18+
$SHA1ASM_alpha=sha1-alpha.S
19+
$SHA1DEF_alpha=SHA1_ASM
20+
21+
$SHA1ASM_mips32=sha1-mips.S sha256-mips.S
22+
$SHA1DEF_mips32=SHA1_ASM SHA256_ASM
23+
$SHA1ASM_mips64=$SHA1ASM_mips32 sha512-mips.S
24+
$SHA1DEF_mips64=$SHA1DEF_mips32 SHA512_ASM
25+
26+
$SHA1ASM_s390x=sha1-s390x.S sha256-s390x.S sha512-s390x.S
27+
$SHA1DEF_s390x=SHA1_ASM SHA256_ASM SHA512_ASM
28+
29+
$SHA1ASM_armv4=sha1-armv4-large.S sha256-armv4.S sha512-armv4.S
30+
$SHA1DEF_armv4=SHA1_ASM SHA256_ASM SHA512_ASM
31+
$SHA1ASM_aarch64=sha1-armv8.S sha256-armv8.S sha512-armv8.S
32+
$SHA1DEF_aarch64=SHA1_ASM SHA256_ASM SHA512_ASM
33+
34+
$SHA1ASM_parisc11=sha1-parisc.s sha256-parisc.s sha512-parisc.s
35+
$SHA1DEF_parisc11=SHA1_ASM SHA256_ASM SHA512_ASM
36+
$SHA1ASM_parisc20_64=$SHA1ASM_parisc11
37+
$SHA1DEF_parisc20_64=$SHA1DEF_parisc11
38+
39+
$SHA1ASM_ppc32=\
40+
sha1-ppc.s sha256-ppc.s sha512-ppc.s sha256p8-ppc.s sha512p8-ppc.s
41+
$SHA1DEF_ppc32=SHA1_ASM SHA256_ASM SHA512_ASM
42+
$SHA1ASM_ppc64=$SHA1ASM_ppc32
43+
$SHA1DEF_ppc64=$SHA1DEF_ppc32
44+
45+
$SHA1ASM_c64xplus=sha1-c64xplus.s sha256-c64xplus.s sha512-c64xplus.s
46+
$SHA1DEF_c64xplus=SHA1_ASM SHA256_ASM SHA512_ASM
47+
48+
# Now that we have defined all the arch specific variables, use the
49+
# appropriate one, and define the appropriate macros
50+
IF[$SHA1ASM_{- $target{asm_arch} -}]
51+
$SHA1ASM=$SHA1ASM_{- $target{asm_arch} -}
52+
$SHA1DEF=$SHA1DEF_{- $target{asm_arch} -}
53+
ENDIF
54+
ENDIF
55+
56+
$COMMON=sha1dgst.c sha256.c sha512.c sha3.c $SHA1ASM \
57+
{- $target{keccak1600_asm_src} -}
558
SOURCE[../../libcrypto]=$COMMON sha1_one.c
59+
DEFINE[../../libcrypto]=$SHA1DEF
660
SOURCE[../../providers/fips]= $COMMON
61+
DEFINE[../../providers/fips]= $SHA1DEF
762

863
GENERATE[sha1-586.s]=asm/sha1-586.pl \
964
$(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR)

0 commit comments

Comments
 (0)