aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crypto/Makefile.am4
-rw-r--r--crypto/Makefile.am.elf-x86_6432
-rw-r--r--crypto/Makefile.am.macosx-x86_6432
-rwxr-xr-xupdate.sh36
4 files changed, 51 insertions, 53 deletions
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index d9f64d9..1398863 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -134,6 +134,7 @@ noinst_HEADERS += constant_time_locl.h
134noinst_HEADERS += cryptlib.h 134noinst_HEADERS += cryptlib.h
135noinst_HEADERS += md32_common.h 135noinst_HEADERS += md32_common.h
136noinst_HEADERS += o_time.h 136noinst_HEADERS += o_time.h
137noinst_HEADERS += x86_arch.h
137 138
138# aes 139# aes
139libcrypto_la_SOURCES += aes/aes_cfb.c 140libcrypto_la_SOURCES += aes/aes_cfb.c
@@ -564,9 +565,6 @@ libcrypto_la_SOURCES += idea/i_ofb64.c
564libcrypto_la_SOURCES += idea/i_skey.c 565libcrypto_la_SOURCES += idea/i_skey.c
565noinst_HEADERS += idea/idea_lcl.h 566noinst_HEADERS += idea/idea_lcl.h
566 567
567# krb5
568libcrypto_la_SOURCES += krb5/krb5_asn.c
569
570# lhash 568# lhash
571libcrypto_la_SOURCES += lhash/lh_stats.c 569libcrypto_la_SOURCES += lhash/lh_stats.c
572libcrypto_la_SOURCES += lhash/lhash.c 570libcrypto_la_SOURCES += lhash/lhash.c
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64
index 44e08a1..4cd34e2 100644
--- a/crypto/Makefile.am.elf-x86_64
+++ b/crypto/Makefile.am.elf-x86_64
@@ -1,22 +1,22 @@
1 1
2ASM_X86_64_ELF = aes/aes-elf-x86_64.s 2ASM_X86_64_ELF = aes/aes-elf-x86_64.S
3ASM_X86_64_ELF += aes/bsaes-elf-x86_64.s 3ASM_X86_64_ELF += aes/bsaes-elf-x86_64.S
4ASM_X86_64_ELF += aes/vpaes-elf-x86_64.s 4ASM_X86_64_ELF += aes/vpaes-elf-x86_64.S
5ASM_X86_64_ELF += aes/aesni-elf-x86_64.s 5ASM_X86_64_ELF += aes/aesni-elf-x86_64.S
6ASM_X86_64_ELF += aes/aesni-sha1-elf-x86_64.s 6ASM_X86_64_ELF += aes/aesni-sha1-elf-x86_64.S
7ASM_X86_64_ELF += bn/modexp512-elf-x86_64.s 7ASM_X86_64_ELF += bn/modexp512-elf-x86_64.S
8ASM_X86_64_ELF += bn/mont-elf-x86_64.s 8ASM_X86_64_ELF += bn/mont-elf-x86_64.S
9ASM_X86_64_ELF += bn/mont5-elf-x86_64.s 9ASM_X86_64_ELF += bn/mont5-elf-x86_64.S
10ASM_X86_64_ELF += bn/gf2m-elf-x86_64.s 10ASM_X86_64_ELF += bn/gf2m-elf-x86_64.S
11ASM_X86_64_ELF += camellia/cmll-elf-x86_64.s 11ASM_X86_64_ELF += camellia/cmll-elf-x86_64.S
12ASM_X86_64_ELF += md5/md5-elf-x86_64.s 12ASM_X86_64_ELF += md5/md5-elf-x86_64.S
13ASM_X86_64_ELF += modes/ghash-elf-x86_64.s 13ASM_X86_64_ELF += modes/ghash-elf-x86_64.S
14ASM_X86_64_ELF += rc4/rc4-elf-x86_64.s 14ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S
15ASM_X86_64_ELF += rc4/rc4-md5-elf-x86_64.s 15ASM_X86_64_ELF += rc4/rc4-md5-elf-x86_64.S
16ASM_X86_64_ELF += sha/sha1-elf-x86_64.s 16ASM_X86_64_ELF += sha/sha1-elf-x86_64.S
17ASM_X86_64_ELF += sha/sha256-elf-x86_64.S 17ASM_X86_64_ELF += sha/sha256-elf-x86_64.S
18ASM_X86_64_ELF += sha/sha512-elf-x86_64.S 18ASM_X86_64_ELF += sha/sha512-elf-x86_64.S
19ASM_X86_64_ELF += whrlpool/wp-elf-x86_64.s 19ASM_X86_64_ELF += whrlpool/wp-elf-x86_64.S
20ASM_X86_64_ELF += cpuid-elf-x86_64.S 20ASM_X86_64_ELF += cpuid-elf-x86_64.S
21 21
22EXTRA_DIST += $(ASM_X86_64_ELF) 22EXTRA_DIST += $(ASM_X86_64_ELF)
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64
index bc2aaad..2118156 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -1,22 +1,22 @@
1 1
2ASM_X86_64_MACOSX = aes/aes-macosx-x86_64.s 2ASM_X86_64_MACOSX = aes/aes-macosx-x86_64.S
3ASM_X86_64_MACOSX += aes/bsaes-macosx-x86_64.s 3ASM_X86_64_MACOSX += aes/bsaes-macosx-x86_64.S
4ASM_X86_64_MACOSX += aes/vpaes-macosx-x86_64.s 4ASM_X86_64_MACOSX += aes/vpaes-macosx-x86_64.S
5ASM_X86_64_MACOSX += aes/aesni-macosx-x86_64.s 5ASM_X86_64_MACOSX += aes/aesni-macosx-x86_64.S
6ASM_X86_64_MACOSX += aes/aesni-sha1-macosx-x86_64.s 6ASM_X86_64_MACOSX += aes/aesni-sha1-macosx-x86_64.S
7ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.s 7ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.S
8ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.s 8ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.S
9ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.s 9ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.S
10ASM_X86_64_MACOSX += bn/gf2m-macosx-x86_64.s 10ASM_X86_64_MACOSX += bn/gf2m-macosx-x86_64.S
11ASM_X86_64_MACOSX += camellia/cmll-macosx-x86_64.s 11ASM_X86_64_MACOSX += camellia/cmll-macosx-x86_64.S
12ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.s 12ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.S
13ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.s 13ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S
14ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.s 14ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S
15ASM_X86_64_MACOSX += rc4/rc4-md5-macosx-x86_64.s 15ASM_X86_64_MACOSX += rc4/rc4-md5-macosx-x86_64.S
16ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.s 16ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S
17ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S 17ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S
18ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S 18ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S
19ASM_X86_64_MACOSX += whrlpool/wp-macosx-x86_64.s 19ASM_X86_64_MACOSX += whrlpool/wp-macosx-x86_64.S
20ASM_X86_64_MACOSX += cpuid-macosx-x86_64.S 20ASM_X86_64_MACOSX += cpuid-macosx-x86_64.S
21 21
22EXTRA_DIST += $(ASM_X86_64_MACOSX) 22EXTRA_DIST += $(ASM_X86_64_MACOSX)
diff --git a/update.sh b/update.sh
index ffcd169..131a374 100755
--- a/update.sh
+++ b/update.sh
@@ -117,7 +117,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
117 objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h 117 objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h
118 ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h 118 ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h
119 pem/pem2.h hmac/hmac.h rand/rand.h md5/md5.h 119 pem/pem2.h hmac/hmac.h rand/rand.h md5/md5.h
120 krb5/krb5_asn.h asn1/asn1_mac.h x509v3/x509v3.h conf/conf.h ocsp/ocsp.h 120 asn1/asn1_mac.h x509v3/x509v3.h conf/conf.h ocsp/ocsp.h
121 aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h 121 aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h
122 bio/bio.h cast/cast.h cmac/cmac.h conf/conf_api.h des/des.h dh/dh.h 122 bio/bio.h cast/cast.h cmac/cmac.h conf/conf_api.h des/des.h dh/dh.h
123 dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h 123 dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h
@@ -169,24 +169,24 @@ gen_asm() {
169} 169}
170for abi in elf macosx; do 170for abi in elf macosx; do
171 echo generating ASM source for $abi 171 echo generating ASM source for $abi
172 gen_asm_stdout $abi aes/asm/aes-x86_64.pl crypto/aes/aes-$abi-x86_64.s 172 gen_asm_stdout $abi aes/asm/aes-x86_64.pl crypto/aes/aes-$abi-x86_64.S
173 gen_asm_stdout $abi aes/asm/vpaes-x86_64.pl crypto/aes/vpaes-$abi-x86_64.s 173 gen_asm_stdout $abi aes/asm/vpaes-x86_64.pl crypto/aes/vpaes-$abi-x86_64.S
174 gen_asm_stdout $abi aes/asm/bsaes-x86_64.pl crypto/aes/bsaes-$abi-x86_64.s 174 gen_asm_stdout $abi aes/asm/bsaes-x86_64.pl crypto/aes/bsaes-$abi-x86_64.S
175 gen_asm_stdout $abi aes/asm/aesni-x86_64.pl crypto/aes/aesni-$abi-x86_64.s 175 gen_asm_stdout $abi aes/asm/aesni-x86_64.pl crypto/aes/aesni-$abi-x86_64.S
176 gen_asm_stdout $abi aes/asm/aesni-sha1-x86_64.pl crypto/aes/aesni-sha1-$abi-x86_64.s 176 gen_asm_stdout $abi aes/asm/aesni-sha1-x86_64.pl crypto/aes/aesni-sha1-$abi-x86_64.S
177 gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl crypto/bn/modexp512-$abi-x86_64.s 177 gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl crypto/bn/modexp512-$abi-x86_64.S
178 gen_asm_stdout $abi bn/asm/x86_64-mont.pl crypto/bn/mont-$abi-x86_64.s 178 gen_asm_stdout $abi bn/asm/x86_64-mont.pl crypto/bn/mont-$abi-x86_64.S
179 gen_asm_stdout $abi bn/asm/x86_64-mont5.pl crypto/bn/mont5-$abi-x86_64.s 179 gen_asm_stdout $abi bn/asm/x86_64-mont5.pl crypto/bn/mont5-$abi-x86_64.S
180 gen_asm_stdout $abi bn/asm/x86_64-gf2m.pl crypto/bn/gf2m-$abi-x86_64.s 180 gen_asm_stdout $abi bn/asm/x86_64-gf2m.pl crypto/bn/gf2m-$abi-x86_64.S
181 gen_asm_stdout $abi camellia/asm/cmll-x86_64.pl crypto/camellia/cmll-$abi-x86_64.s 181 gen_asm_stdout $abi camellia/asm/cmll-x86_64.pl crypto/camellia/cmll-$abi-x86_64.S
182 gen_asm_stdout $abi md5/asm/md5-x86_64.pl crypto/md5/md5-$abi-x86_64.s 182 gen_asm_stdout $abi md5/asm/md5-x86_64.pl crypto/md5/md5-$abi-x86_64.S
183 gen_asm_stdout $abi modes/asm/ghash-x86_64.pl crypto/modes/ghash-$abi-x86_64.s 183 gen_asm_stdout $abi modes/asm/ghash-x86_64.pl crypto/modes/ghash-$abi-x86_64.S
184 gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl crypto/rc4/rc4-$abi-x86_64.s 184 gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl crypto/rc4/rc4-$abi-x86_64.S
185 gen_asm_stdout $abi rc4/asm/rc4-md5-x86_64.pl crypto/rc4/rc4-md5-$abi-x86_64.s 185 gen_asm_stdout $abi rc4/asm/rc4-md5-x86_64.pl crypto/rc4/rc4-md5-$abi-x86_64.S
186 gen_asm_stdout $abi sha/asm/sha1-x86_64.pl crypto/sha/sha1-$abi-x86_64.s 186 gen_asm_stdout $abi sha/asm/sha1-x86_64.pl crypto/sha/sha1-$abi-x86_64.S
187 gen_asm $abi sha/asm/sha512-x86_64.pl crypto/sha/sha256-$abi-x86_64.S 187 gen_asm $abi sha/asm/sha512-x86_64.pl crypto/sha/sha256-$abi-x86_64.S
188 gen_asm $abi sha/asm/sha512-x86_64.pl crypto/sha/sha512-$abi-x86_64.S 188 gen_asm $abi sha/asm/sha512-x86_64.pl crypto/sha/sha512-$abi-x86_64.S
189 gen_asm_stdout $abi whrlpool/asm/wp-x86_64.pl crypto/whrlpool/wp-$abi-x86_64.s 189 gen_asm_stdout $abi whrlpool/asm/wp-x86_64.pl crypto/whrlpool/wp-$abi-x86_64.S
190 gen_asm $abi x86_64cpuid.pl crypto/cpuid-$abi-x86_64.S 190 gen_asm $abi x86_64cpuid.pl crypto/cpuid-$abi-x86_64.S
191done 191done
192 192
@@ -248,7 +248,6 @@ for i in `find $libcrypto_regress -name '*.c'`; do
248done 248done
249$CP $libcrypto_regress/evp/evptests.txt tests 249$CP $libcrypto_regress/evp/evptests.txt tests
250$CP $libcrypto_regress/aead/aeadtests.txt tests 250$CP $libcrypto_regress/aead/aeadtests.txt tests
251$CP $libcrypto_regress/pqueue/expected.txt tests/pq_expected.txt
252 251
253# copy libc tests 252# copy libc tests
254$CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c 253$CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c
@@ -264,6 +263,7 @@ done
264$CP $libssl_regress/unit/tests.h tests 263$CP $libssl_regress/unit/tests.h tests
265$CP $libssl_regress/certs/ca.pem tests 264$CP $libssl_regress/certs/ca.pem tests
266$CP $libssl_regress/certs/server.pem tests 265$CP $libssl_regress/certs/server.pem tests
266$CP $libssl_regress/pqueue/expected.txt tests/pq_expected.txt
267 267
268# copy libtls tests 268# copy libtls tests
269for i in `find $libtls_regress -name '*.c'`; do 269for i in `find $libtls_regress -name '*.c'`; do
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-09 07:41:39 +0000