From 9664476479817a183ab0a5385cb0b89dde400006 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Mon, 3 Feb 2020 02:52:27 +0300 Subject: [PATCH] Update OpenSSL --- contrib/openssl | 2 +- contrib/openssl-cmake/CMakeLists.txt | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/contrib/openssl b/contrib/openssl index c74e7895eb0..943e83620d1 160000 --- a/contrib/openssl +++ b/contrib/openssl @@ -1 +1 @@ -Subproject commit c74e7895eb0d219d4007775eec134dd2bcd9d1ae +Subproject commit 943e83620d178025df0695e707557bd702922b49 diff --git a/contrib/openssl-cmake/CMakeLists.txt b/contrib/openssl-cmake/CMakeLists.txt index 8dc0c6ae6c5..4dd76665006 100644 --- a/contrib/openssl-cmake/CMakeLists.txt +++ b/contrib/openssl-cmake/CMakeLists.txt @@ -188,6 +188,7 @@ ${OPENSSL_SOURCE_DIR}/crypto/bio/bf_buff.c ${OPENSSL_SOURCE_DIR}/crypto/bio/bf_lbuf.c ${OPENSSL_SOURCE_DIR}/crypto/bio/bf_nbio.c ${OPENSSL_SOURCE_DIR}/crypto/bio/bf_null.c +${OPENSSL_SOURCE_DIR}/crypto/bio/bf_prefix.c ${OPENSSL_SOURCE_DIR}/crypto/bio/bio_cb.c ${OPENSSL_SOURCE_DIR}/crypto/bio/bio_err.c ${OPENSSL_SOURCE_DIR}/crypto/bio/bio_lib.c @@ -320,6 +321,7 @@ ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_check.c ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_depr.c ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_err.c ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_gen.c +${OPENSSL_SOURCE_DIR}/crypto/dh/dh_group_params.c ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_kdf.c ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_key.c ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_lib.c @@ -327,7 +329,7 @@ ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_meth.c ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_pmeth.c ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_prn.c ${OPENSSL_SOURCE_DIR}/crypto/dh/dh_rfc5114.c -${OPENSSL_SOURCE_DIR}/crypto/dh/dh_rfc7919.c +${OPENSSL_SOURCE_DIR}/crypto/dsa/dsa_aid.c ${OPENSSL_SOURCE_DIR}/crypto/dsa/dsa_ameth.c ${OPENSSL_SOURCE_DIR}/crypto/dsa/dsa_asn1.c ${OPENSSL_SOURCE_DIR}/crypto/dsa/dsa_depr.c @@ -464,10 +466,10 @@ ${OPENSSL_SOURCE_DIR}/crypto/evp/legacy_md5.c ${OPENSSL_SOURCE_DIR}/crypto/evp/legacy_md5_sha1.c ${OPENSSL_SOURCE_DIR}/crypto/evp/legacy_mdc2.c ${OPENSSL_SOURCE_DIR}/crypto/evp/legacy_sha.c +${OPENSSL_SOURCE_DIR}/crypto/evp/legacy_ripemd.c +${OPENSSL_SOURCE_DIR}/crypto/evp/legacy_wp.c ${OPENSSL_SOURCE_DIR}/crypto/evp/m_null.c -${OPENSSL_SOURCE_DIR}/crypto/evp/m_ripemd.c ${OPENSSL_SOURCE_DIR}/crypto/evp/m_sigver.c -${OPENSSL_SOURCE_DIR}/crypto/evp/m_wp.c ${OPENSSL_SOURCE_DIR}/crypto/evp/mac_lib.c ${OPENSSL_SOURCE_DIR}/crypto/evp/mac_meth.c ${OPENSSL_SOURCE_DIR}/crypto/evp/names.c @@ -486,6 +488,8 @@ ${OPENSSL_SOURCE_DIR}/crypto/evp/pkey_mac.c ${OPENSSL_SOURCE_DIR}/crypto/evp/pmeth_fn.c ${OPENSSL_SOURCE_DIR}/crypto/evp/pmeth_gn.c ${OPENSSL_SOURCE_DIR}/crypto/evp/pmeth_lib.c +${OPENSSL_SOURCE_DIR}/crypto/evp/signature.c +${OPENSSL_SOURCE_DIR}/crypto/ffc/ffc_params.c ${OPENSSL_SOURCE_DIR}/crypto/hmac/hm_ameth.c ${OPENSSL_SOURCE_DIR}/crypto/hmac/hmac.c ${OPENSSL_SOURCE_DIR}/crypto/idea/i_cbc.c @@ -529,6 +533,7 @@ ${OPENSSL_SOURCE_DIR}/crypto/provider_conf.c ${OPENSSL_SOURCE_DIR}/crypto/provider_core.c ${OPENSSL_SOURCE_DIR}/crypto/provider_predefined.c ${OPENSSL_SOURCE_DIR}/crypto/sparse_array.c +${OPENSSL_SOURCE_DIR}/crypto/self_test_core.c ${OPENSSL_SOURCE_DIR}/crypto/threads_none.c ${OPENSSL_SOURCE_DIR}/crypto/threads_pthread.c ${OPENSSL_SOURCE_DIR}/crypto/threads_win.c @@ -673,8 +678,8 @@ ${OPENSSL_SOURCE_DIR}/crypto/sm2/sm2_crypt.c ${OPENSSL_SOURCE_DIR}/crypto/sm2/sm2_err.c ${OPENSSL_SOURCE_DIR}/crypto/sm2/sm2_pmeth.c ${OPENSSL_SOURCE_DIR}/crypto/sm2/sm2_sign.c -${OPENSSL_SOURCE_DIR}/crypto/sm3/m_sm3.c ${OPENSSL_SOURCE_DIR}/crypto/sm3/sm3.c +${OPENSSL_SOURCE_DIR}/crypto/sm3/legacy_sm3.c ${OPENSSL_SOURCE_DIR}/crypto/sm4/sm4.c ${OPENSSL_SOURCE_DIR}/crypto/srp/srp_lib.c ${OPENSSL_SOURCE_DIR}/crypto/srp/srp_vfy.c @@ -779,7 +784,11 @@ ${OPENSSL_SOURCE_DIR}/crypto/x509/x_x509.c ${OPENSSL_SOURCE_DIR}/crypto/x509/x_x509a.c ${OPENSSL_SOURCE_DIR}/providers/implementations/asymciphers/rsa_enc.c ${OPENSSL_SOURCE_DIR}/providers/defltprov.c +${OPENSSL_SOURCE_DIR}/providers/implementations/ciphers/cipher_null.c ${OPENSSL_SOURCE_DIR}/providers/implementations/ciphers/cipher_aes.c +${OPENSSL_SOURCE_DIR}/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c +${OPENSSL_SOURCE_DIR}/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c +${OPENSSL_SOURCE_DIR}/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c ${OPENSSL_SOURCE_DIR}/providers/implementations/ciphers/cipher_aes_ccm.c ${OPENSSL_SOURCE_DIR}/providers/implementations/ciphers/cipher_aes_ccm_hw.c ${OPENSSL_SOURCE_DIR}/providers/implementations/ciphers/cipher_aes_gcm.c