Index: openssl/openssl.config |
diff --git a/openssl/openssl.config b/openssl/openssl.config |
index c8f8e986fd006cab8338f56127f47977e09bc4af..d6065b0d4a1ebc9fc062ada8a16379020f24986b 100644 |
--- a/openssl/openssl.config |
+++ b/openssl/openssl.config |
@@ -270,6 +270,22 @@ DES_UNROLL \ |
OPENSSL_CPUID_OBJ \ |
" |
+OPENSSL_CRYPTO_DEFINES_mac_ia32="\ |
+OPENSSL_BN_ASM_GF2m \ |
+OPENSSL_BN_ASM_MONT \ |
+OPENSSL_BN_ASM_PART_WORDS \ |
+AES_ASM \ |
+GHASH_ASM \ |
+SHA1_ASM \ |
+SHA256_ASM \ |
+SHA512_ASM \ |
+MD5_ASM \ |
+DES_PTR \ |
+DES_RISC1 \ |
+DES_UNROLL \ |
+OPENSSL_CPUID_OBJ \ |
+" |
+ |
OPENSSL_CRYPTO_INCLUDES="\ |
. \ |
include \ |
@@ -848,6 +864,35 @@ crypto/des/fcrypt_b.c \ |
crypto/mem_clr.c \ |
" |
+OPENSSL_CRYPTO_SOURCES_mac_ia32="\ |
+crypto/aes/asm/aes-586-mac.S \ |
+crypto/aes/asm/aesni-x86-mac.S \ |
+crypto/aes/asm/vpaes-x86-mac.S \ |
+crypto/bf/asm/bf-586-mac.S \ |
+crypto/bn/asm/bn-586-mac.S \ |
+crypto/bn/asm/co-586-mac.S \ |
+crypto/bn/asm/x86-gf2m-mac.S \ |
+crypto/bn/asm/x86-mont-mac.S \ |
+crypto/des/asm/crypt586-mac.S \ |
+crypto/des/asm/des-586-mac.S \ |
+crypto/md5/asm/md5-586-mac.S \ |
+crypto/modes/asm/ghash-x86-mac.S \ |
+crypto/sha/asm/sha1-586-mac.S \ |
+crypto/sha/asm/sha256-586-mac.S \ |
+crypto/sha/asm/sha512-586-mac.S \ |
+crypto/x86cpuid-mac.S \ |
+" |
+ |
+OPENSSL_CRYPTO_SOURCES_EXCLUDES_mac_ia32="\ |
+crypto/aes/aes_core.c \ |
+crypto/aes/aes_cbc.c \ |
+crypto/bf/bf_enc.c \ |
+crypto/bn/bn_asm.c \ |
+crypto/des/des_enc.c \ |
+crypto/des/fcrypt_b.c \ |
+crypto/mem_clr.c \ |
+" |
+ |
OPENSSL_CRYPTO_SOURCES_x86_64="\ |
crypto/aes/asm/aes-x86_64.S \ |
crypto/aes/asm/aesni-x86_64.S \ |
@@ -1016,6 +1061,7 @@ use_aead_for_aes_gcm.patch \ |
chacha20poly1305.patch \ |
neon_runtime.patch \ |
paddingext.patch \ |
+mac_ia32_assembly.patch \ |
" |
OPENSSL_PATCHES_progs_SOURCES="\ |
@@ -1089,3 +1135,22 @@ crypto/objects/obj_dat.c |
include/openssl/lhash.h |
ssl/ssl_sess.c |
" |
+ |
+OPENSSL_PATCHES_mac_ia32_assembly_SOURCES="\ |
+crypto/aes/asm/aes-586-mac.S \ |
+crypto/aes/asm/aesni-x86-mac.S \ |
+crypto/aes/asm/vpaes-x86-mac.S \ |
+crypto/bf/asm/bf-586-mac.S \ |
+crypto/bn/asm/bn-586-mac.S \ |
+crypto/bn/asm/co-586-mac.S \ |
+crypto/bn/asm/x86-gf2m-mac.S \ |
+crypto/bn/asm/x86-mont-mac.S \ |
+crypto/des/asm/crypt586-mac.S \ |
+crypto/des/asm/des-586-mac.S \ |
+crypto/md5/asm/md5-586-mac.S \ |
+crypto/modes/asm/ghash-x86-mac.S \ |
+crypto/sha/asm/sha1-586-mac.S \ |
+crypto/sha/asm/sha256-586-mac.S \ |
+crypto/sha/asm/sha512-586-mac.S \ |
+crypto/x86cpuid-mac.S \ |
+" |