1 files changed, 95 insertions, 41 deletions
diff --git a/app/openssl/openssl.config b/app/openssl/openssl.config
index 867711fe..aa028705 100644
--- a/app/openssl/openssl.config
+++ b/app/openssl/openssl.config
@@ -13,7 +13,6 @@ no-md2 \
 no-mdc2 \
 no-rc5 \
 no-rdrand \
-no-ripemd \
 no-rfc3779 \
 no-rsax \
 no-sctp \
@@ -54,7 +53,6 @@ crypto/cast \
 crypto/idea \
 crypto/md2 \
 crypto/rc5 \
-crypto/ripemd \
 crypto/seed \
 crypto/whrlpool \
 demos \
@@ -96,6 +94,7 @@ README.ASN1 \
 README.ENGINE \
 apps/CA.com \
 apps/Makefile \
+apps/Makefile.save \
 apps/install-apps.com \
 apps/makeapps.com \
 apps/openssl-vms.cnf \
@@ -105,10 +104,14 @@ apps/vms_decc_init.c \
 config \
 crypto/LPdir_vms.c \
 crypto/Makefile \
+crypto/Makefile.save \
 crypto/aes/Makefile \
+crypto/aes/Makefile.save \
 crypto/asn1/Makefile \
+crypto/asn1/Makefile.save \
 crypto/bf/INSTALL \
 crypto/bf/Makefile \
+crypto/bf/Makefile.save \
 crypto/bf/README \
 crypto/bf/VERSION \
 crypto/bf/asm/readme \
@@ -118,77 +121,117 @@ crypto/bf/bfs.cpp \
 crypto/bf/bfspeed.c \
 crypto/bf/bftest.c \
 crypto/bio/Makefile \
+crypto/bio/Makefile.save \
 crypto/bio/bss_rtcp.c \
 crypto/bn/Makefile \
+crypto/bn/Makefile.save \
 crypto/bn/asm/vms.mar \
 crypto/bn/bn_x931p.c \
 crypto/bn/vms-helper.c \
 crypto/buffer/Makefile \
+crypto/buffer/Makefile.save \
 crypto/cmac/Makefile \
+crypto/cmac/Makefile.save \
 crypto/cms/Makefile \
+crypto/cms/Makefile.save \
 crypto/comp/Makefile \
+crypto/comp/Makefile.save \
 crypto/conf/Makefile \
+crypto/conf/Makefile.save \
 crypto/crypto-lib.com \
 crypto/des/Makefile \
+crypto/des/Makefile.save \
 crypto/des/des-lib.com \
 crypto/dh/Makefile \
+crypto/dh/Makefile.save \
 crypto/dh/dh_prn.c \
 crypto/dsa/Makefile \
+crypto/dsa/Makefile.save \
 crypto/dso/Makefile \
+crypto/dso/Makefile.save \
 crypto/dso/dso_beos.c \
 crypto/dso/dso_vms.c \
 crypto/dso/dso_win32.c \
 crypto/ec/Makefile \
+crypto/ec/Makefile.save \
 crypto/ec/ecp_nistp224.c \
 crypto/ec/ecp_nistp256.c \
 crypto/ec/ecp_nistp521.c \
 crypto/ec/ecp_nistputil.c \
 crypto/ecdh/Makefile \
+crypto/ecdh/Makefile.save \
 crypto/ecdsa/Makefile \
+crypto/ecdsa/Makefile.save \
 crypto/engine/Makefile \
+crypto/engine/Makefile.save \
 crypto/engine/eng_rdrand.c \
 crypto/engine/eng_rsax.c \
 crypto/err/Makefile \
+crypto/err/Makefile.save \
 crypto/evp/Makefile \
+crypto/evp/Makefile.save \
 crypto/evp/evp_fips.c \
 crypto/evp/m_md2.c \
 crypto/evp/m_sha.c \
 crypto/fips_err.h \
 crypto/fips_ers.c \
 crypto/hmac/Makefile \
+crypto/hmac/Makefile.save \
 crypto/install-crypto.com \
 crypto/jpake/Makefile \
 crypto/krb5/Makefile \
+crypto/krb5/Makefile.save \
 crypto/lhash/Makefile \
+crypto/lhash/Makefile.save \
 crypto/md4/Makefile \
+crypto/md4/Makefile.save \
 crypto/md5/Makefile \
+crypto/md5/Makefile.save \
 crypto/mdc2/Makefile \
+crypto/mdc2/Makefile.save \
 crypto/modes/Makefile \
+crypto/modes/Makefile.save \
 crypto/modes/cts128.c \
 crypto/modes/modes.h \
 crypto/o_fips.c \
 crypto/objects/Makefile \
+crypto/objects/Makefile.save \
 crypto/ocsp/Makefile \
+crypto/ocsp/Makefile.save \
 crypto/pem/Makefile \
+crypto/pem/Makefile.save \
 crypto/pkcs12/Makefile \
+crypto/pkcs12/Makefile.save \
 crypto/pkcs7/Makefile \
+crypto/pkcs7/Makefile.save \
 crypto/pkcs7/bio_pk7.c \
 crypto/ppccap.c \
 crypto/pqueue/Makefile \
+crypto/pqueue/Makefile.save \
 crypto/rand/Makefile \
+crypto/rand/Makefile.save \
 crypto/rand/rand_vms.c \
 crypto/rc2/Makefile \
+crypto/rc2/Makefile.save \
 crypto/rc4/Makefile \
+crypto/rc4/Makefile.save \
+crypto/ripemd/Makefile \
+crypto/ripemd/Makefile.save \
 crypto/rsa/Makefile \
+crypto/rsa/Makefile.save \
 crypto/sha/Makefile \
+crypto/sha/Makefile.save \
 crypto/sha/sha_one.c \
 crypto/srp/Makefile \
+crypto/srp/Makefile.save \
 crypto/srp/srptest.c \
 crypto/stack/Makefile \
+crypto/stack/Makefile.save \
 crypto/store/Makefile \
 crypto/threads/pthreads-vms.com \
 crypto/threads/win32.bat \
 crypto/ts/Makefile \
+crypto/ts/Makefile.save \
 crypto/ts/ts.h \
 crypto/ts/ts_asn1.c \
 crypto/ts/ts_conf.c \
@@ -201,10 +244,14 @@ crypto/ts/ts_rsp_utils.c \
 crypto/ts/ts_rsp_verify.c \
 crypto/ts/ts_verify_ctx.c \
 crypto/txt_db/Makefile \
+crypto/txt_db/Makefile.save \
 crypto/ui/Makefile \
+crypto/ui/Makefile.save \
 crypto/vms_rms.h
 crypto/x509/Makefile \
+crypto/x509/Makefile.save \
 crypto/x509v3/Makefile \
+crypto/x509v3/Makefile.save \
 include/openssl/camellia.h \
 include/openssl/cast.h \
 include/openssl/idea.h \
@@ -216,11 +263,11 @@ makevms.com \
 openssl.doxy \
 openssl.spec \
 ssl/Makefile \
-ssl/heartbeat_test.c \
+ssl/Makefile.save \
 ssl/install-ssl.com \
 ssl/ssl-lib.com \
 ssl/ssl_task.c \
-"
+" 
 
 NEEDED_SOURCES="\
 apps \
@@ -238,24 +285,19 @@ NO_WINDOWS_BRAINDEATH \
 "
 
 OPENSSL_CRYPTO_DEFINES_arm="\
-AES_ASM \
-BSAES_ASM \
-DES_UNROLL \
-GHASH_ASM \
 OPENSSL_BN_ASM_GF2m \
 OPENSSL_BN_ASM_MONT \
 OPENSSL_CPUID_OBJ \
+GHASH_ASM \
+AES_ASM \
+BSAES_ASM \
 SHA1_ASM \
 SHA256_ASM \
 SHA512_ASM \
 "
 
 OPENSSL_CRYPTO_DEFINES_arm64="\
-DES_UNROLL \
-OPENSSL_CPUID_OBJ \
-SHA1_ASM \
-SHA256_ASM \
-SHA512_ASM \
+OPENSSL_NO_ASM \
 "
 
 OPENSSL_CRYPTO_DEFINES_mips="\
@@ -266,40 +308,39 @@ SHA256_ASM \
 "
 
 OPENSSL_CRYPTO_DEFINES_x86="\
-AES_ASM \
-DES_PTR \
-DES_RISC1 \
-DES_UNROLL \
-GHASH_ASM \
-MD5_ASM \
+OPENSSL_IA32_SSE2 \
 OPENSSL_BN_ASM_GF2m \
 OPENSSL_BN_ASM_MONT \
 OPENSSL_BN_ASM_PART_WORDS \
-OPENSSL_CPUID_OBJ \
-OPENSSL_IA32_SSE2 \
-RC4_INDEX \
-RMD160_ASM \
+AES_ASM \
+VPAES_ASM \
+GHASH_ASM \
 SHA1_ASM \
 SHA256_ASM \
 SHA512_ASM \
-VPAES_ASM \
+MD5_ASM \
+DES_PTR \
+DES_RISC1 \
+DES_UNROLL \
+OPENSSL_CPUID_OBJ \
 "
 
 OPENSSL_CRYPTO_DEFINES_x86_64="\
-AES_ASM \
-BSAES_ASM \
-DES_UNROLL \
-GHASH_ASM \
-MD5_ASM \
 OPENSSL_BN_ASM_GF2m \
 OPENSSL_BN_ASM_MONT \
 OPENSSL_BN_ASM_MONT5 \
-OPENSSL_CPUID_OBJ \
-OPENSSL_IA32_SSE2 \
+AES_ASM \
+VPAES_ASM \
+BSAES_ASM \
+GHASH_ASM \
 SHA1_ASM \
 SHA256_ASM \
 SHA512_ASM \
-VPAES_ASM \
+MD5_ASM \
+DES_PTR \
+DES_RISC1 \
+DES_UNROLL \
+OPENSSL_CPUID_OBJ \
 "
 
 OPENSSL_CRYPTO_INCLUDES="\
@@ -635,6 +676,7 @@ crypto/evp/m_md4.c \
 crypto/evp/m_md5.c \
 crypto/evp/m_mdc2.c \
 crypto/evp/m_null.c \
+crypto/evp/m_ripemd.c \
 crypto/evp/m_sha1.c \
 crypto/evp/m_sigver.c \
 crypto/evp/m_wp.c \
@@ -733,6 +775,8 @@ crypto/rc2/rc2ofb64.c \
 crypto/rc4/rc4_enc.c \
 crypto/rc4/rc4_skey.c \
 crypto/rc4/rc4_utl.c \
+crypto/ripemd/rmd_dgst.c \
+crypto/ripemd/rmd_one.c \
 crypto/rsa/rsa_ameth.c \
 crypto/rsa/rsa_asn1.c \
 crypto/rsa/rsa_chk.c \
@@ -829,14 +873,12 @@ crypto/x509v3/v3err.c \
 
 OPENSSL_CRYPTO_SOURCES_arm="\
 crypto/aes/asm/aes-armv4.S \
-crypto/aes/asm/aesv8-armx.S \
 crypto/aes/asm/bsaes-armv7.S \
 crypto/armcap.c \
 crypto/armv4cpuid.S \
 crypto/bn/asm/armv4-gf2m.S \
 crypto/bn/asm/armv4-mont.S \
 crypto/modes/asm/ghash-armv4.S \
-crypto/modes/asm/ghashv8-armx.S \
 crypto/sha/asm/sha1-armv4-large.S \
 crypto/sha/asm/sha256-armv4.S \
 crypto/sha/asm/sha512-armv4.S \
@@ -848,13 +890,6 @@ crypto/mem_clr.c \
 "
 
 OPENSSL_CRYPTO_SOURCES_arm64="\
-crypto/armcap.c \
-crypto/arm64cpuid.S \
-crypto/aes/asm/aesv8-armx-64.S \
-crypto/modes/asm/ghashv8-armx-64.S \
-crypto/sha/asm/sha1-armv8.S \
-crypto/sha/asm/sha256-armv8.S \
-crypto/sha/asm/sha512-armv8.S \
 "
 
 OPENSSL_CRYPTO_SOURCES_EXCLUDES_arm64="\
@@ -1047,4 +1082,23 @@ apps/version.c \
 apps/x509.c \
 "
 
+OPENSSL_PATCHES="\
+progs.patch \
+handshake_cutthrough.patch \
+jsse.patch \
+channelid.patch \
+eng_dyn_dirs.patch \
+fix_clang_build.patch \
+tls12_digests.patch \
+alpn.patch \
+cbc_record_splitting.patch \
+dsa_nonce.patch \
+ecdhe_psk.patch \
+wincrypt.patch \
+tls_psk_hint.patch \
+arm_asm.patch \
+psk_client_callback_128_byte_id_bug.patch \
+early_ccs.patch \
+"
+
 source ./openssl.trusty.config