From af0a8e9269d518eb2be690426fc379448f034c66 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Thu, 28 Dec 2023 23:41:44 -0700 Subject: [PATCH] Some evp files were renamed and merged --- crypto/CMakeLists.txt | 8 +++----- crypto/Makefile.am | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 816269d106..4716ddd043 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -488,8 +488,6 @@ set( evp/bio_enc.c evp/bio_md.c evp/c_all.c - evp/cipher_method_lib.c - evp/digest.c evp/e_aes.c evp/e_aes_cbc_hmac_sha1.c evp/e_bf.c @@ -507,12 +505,12 @@ set( evp/e_rc4_hmac_md5.c evp/e_sm4.c evp/e_xcbc_d.c - evp/encode.c evp/evp_aead.c - evp/evp_enc.c + evp/evp_cipher.c + evp/evp_digest.c + evp/evp_encode.c evp/evp_err.c evp/evp_key.c - evp/evp_lib.c evp/evp_pbe.c evp/evp_pkey.c evp/m_gost2814789.c diff --git a/crypto/Makefile.am b/crypto/Makefile.am index f0725e19eb..611d7e021d 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -601,8 +601,6 @@ libcrypto_la_SOURCES += evp/bio_b64.c libcrypto_la_SOURCES += evp/bio_enc.c libcrypto_la_SOURCES += evp/bio_md.c libcrypto_la_SOURCES += evp/c_all.c -libcrypto_la_SOURCES += evp/cipher_method_lib.c -libcrypto_la_SOURCES += evp/digest.c libcrypto_la_SOURCES += evp/e_aes.c libcrypto_la_SOURCES += evp/e_aes_cbc_hmac_sha1.c libcrypto_la_SOURCES += evp/e_bf.c @@ -620,12 +618,12 @@ libcrypto_la_SOURCES += evp/e_rc4.c libcrypto_la_SOURCES += evp/e_rc4_hmac_md5.c libcrypto_la_SOURCES += evp/e_sm4.c libcrypto_la_SOURCES += evp/e_xcbc_d.c -libcrypto_la_SOURCES += evp/encode.c libcrypto_la_SOURCES += evp/evp_aead.c -libcrypto_la_SOURCES += evp/evp_enc.c +libcrypto_la_SOURCES += evp/evp_cipher.c +libcrypto_la_SOURCES += evp/evp_digest.c +libcrypto_la_SOURCES += evp/evp_encode.c libcrypto_la_SOURCES += evp/evp_err.c libcrypto_la_SOURCES += evp/evp_key.c -libcrypto_la_SOURCES += evp/evp_lib.c libcrypto_la_SOURCES += evp/evp_pbe.c libcrypto_la_SOURCES += evp/evp_pkey.c libcrypto_la_SOURCES += evp/m_gost2814789.c