diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index ea4a86c..cce0e70 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -257,7 +257,6 @@ set( aes/aes_ctr.c aes/aes_ecb.c aes/aes_ige.c - aes/aes_misc.c aes/aes_ofb.c aes/aes_wrap.c asn1/a_bitstr.c @@ -294,7 +293,6 @@ set( asn1/p5_pbev2.c asn1/p8_pkey.c asn1/t_crl.c - asn1/t_pkey.c asn1/t_req.c asn1/t_spki.c asn1/t_x509.c @@ -373,7 +371,6 @@ set( bn/bn_sqr.c bn/bn_word.c buffer/buf_err.c - buffer/buf_str.c buffer/buffer.c bytestring/bs_ber.c bytestring/bs_cbb.c @@ -405,10 +402,6 @@ set( cms/cms_pwri.c cms/cms_sd.c cms/cms_smime.c - comp/c_rle.c - comp/c_zlib.c - comp/comp_err.c - comp/comp_lib.c conf/conf_api.c conf/conf_def.c conf/conf_err.c @@ -468,11 +461,6 @@ set( dsa/dsa_ossl.c dsa/dsa_pmeth.c dsa/dsa_prn.c - dso/dso_dlfcn.c - dso/dso_err.c - dso/dso_lib.c - dso/dso_null.c - dso/dso_openssl.c ec/ec_ameth.c ec/ec_asn1.c ec/ec_check.c @@ -492,36 +480,8 @@ set( ec/ecp_smpl.c ec/ecx_methods.c ecdh/ecdh.c - ecdh/ech_err.c - ecdh/ech_lib.c ecdsa/ecdsa.c - ecdsa/ecs_err.c - ecdsa/ecs_lib.c engine/engine_stubs.c - engine/eng_all.c - engine/eng_cnf.c - engine/eng_ctrl.c - engine/eng_dyn.c - engine/eng_err.c - engine/eng_fat.c - engine/eng_init.c - engine/eng_lib.c - engine/eng_list.c - engine/eng_openssl.c - engine/eng_pkey.c - engine/eng_table.c - engine/tb_asnmth.c - engine/tb_cipher.c - engine/tb_dh.c - engine/tb_digest.c - engine/tb_dsa.c - engine/tb_ecdh.c - engine/tb_ecdsa.c - engine/tb_eckey.c - engine/tb_pkmeth.c - engine/tb_rand.c - engine/tb_rsa.c - engine/tb_store.c err/err.c err/err_all.c err/err_prn.c @@ -609,10 +569,8 @@ set( kdf/kdf_err.c lhash/lh_stats.c lhash/lhash.c - md4/md4_dgst.c - md4/md4_one.c - md5/md5_dgst.c - md5/md5_one.c + md4/md4.c + md5/md5.c modes/cbc128.c modes/ccm128.c modes/cfb128.c @@ -677,8 +635,7 @@ set( rc2/rc2_skey.c rc2/rc2cfb64.c rc2/rc2ofb64.c - ripemd/rmd_dgst.c - ripemd/rmd_one.c + ripemd/ripemd.c rsa/rsa_ameth.c rsa/rsa_asn1.c rsa/rsa_chk.c diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 91ff226..d048668 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -236,7 +236,6 @@ libcrypto_la_SOURCES += aes/aes_cfb.c libcrypto_la_SOURCES += aes/aes_ctr.c libcrypto_la_SOURCES += aes/aes_ecb.c libcrypto_la_SOURCES += aes/aes_ige.c -libcrypto_la_SOURCES += aes/aes_misc.c libcrypto_la_SOURCES += aes/aes_ofb.c libcrypto_la_SOURCES += aes/aes_wrap.c noinst_HEADERS += aes/aes_local.h @@ -276,7 +275,6 @@ libcrypto_la_SOURCES += asn1/p5_pbe.c libcrypto_la_SOURCES += asn1/p5_pbev2.c libcrypto_la_SOURCES += asn1/p8_pkey.c libcrypto_la_SOURCES += asn1/t_crl.c -libcrypto_la_SOURCES += asn1/t_pkey.c libcrypto_la_SOURCES += asn1/t_req.c libcrypto_la_SOURCES += asn1/t_spki.c libcrypto_la_SOURCES += asn1/t_x509.c @@ -432,7 +430,6 @@ noinst_HEADERS += bn/arch/amd64/bn_arch.h # buffer libcrypto_la_SOURCES += buffer/buf_err.c -libcrypto_la_SOURCES += buffer/buf_str.c libcrypto_la_SOURCES += buffer/buffer.c noinst_HEADERS += bytestring/bytestring.h @@ -484,13 +481,6 @@ libcrypto_la_SOURCES += cms/cms_sd.c libcrypto_la_SOURCES += cms/cms_smime.c noinst_HEADERS += cms/cms_local.h -# comp -libcrypto_la_SOURCES += comp/c_rle.c -libcrypto_la_SOURCES += comp/c_zlib.c -libcrypto_la_SOURCES += comp/comp_err.c -libcrypto_la_SOURCES += comp/comp_lib.c -noinst_HEADERS += comp/comp_local.h - # conf libcrypto_la_SOURCES += conf/conf_api.c libcrypto_la_SOURCES += conf/conf_def.c @@ -571,13 +561,6 @@ libcrypto_la_SOURCES += dsa/dsa_pmeth.c libcrypto_la_SOURCES += dsa/dsa_prn.c noinst_HEADERS += dsa/dsa_local.h -# dso -libcrypto_la_SOURCES += dso/dso_dlfcn.c -libcrypto_la_SOURCES += dso/dso_err.c -libcrypto_la_SOURCES += dso/dso_lib.c -libcrypto_la_SOURCES += dso/dso_null.c -libcrypto_la_SOURCES += dso/dso_openssl.c - # ec libcrypto_la_SOURCES += ec/ec_ameth.c libcrypto_la_SOURCES += ec/ec_asn1.c @@ -601,42 +584,13 @@ noinst_HEADERS += ec/ec_local.h # ecdh libcrypto_la_SOURCES += ecdh/ecdh.c -libcrypto_la_SOURCES += ecdh/ech_err.c -libcrypto_la_SOURCES += ecdh/ech_lib.c # ecdsa libcrypto_la_SOURCES += ecdsa/ecdsa.c -libcrypto_la_SOURCES += ecdsa/ecs_err.c -libcrypto_la_SOURCES += ecdsa/ecs_lib.c noinst_HEADERS += ecdsa/ecdsa_local.h # engine libcrypto_la_SOURCES += engine/engine_stubs.c -libcrypto_la_SOURCES += engine/eng_all.c -libcrypto_la_SOURCES += engine/eng_cnf.c -libcrypto_la_SOURCES += engine/eng_ctrl.c -libcrypto_la_SOURCES += engine/eng_dyn.c -libcrypto_la_SOURCES += engine/eng_err.c -libcrypto_la_SOURCES += engine/eng_fat.c -libcrypto_la_SOURCES += engine/eng_init.c -libcrypto_la_SOURCES += engine/eng_lib.c -libcrypto_la_SOURCES += engine/eng_list.c -libcrypto_la_SOURCES += engine/eng_openssl.c -libcrypto_la_SOURCES += engine/eng_pkey.c -libcrypto_la_SOURCES += engine/eng_table.c -libcrypto_la_SOURCES += engine/tb_asnmth.c -libcrypto_la_SOURCES += engine/tb_cipher.c -libcrypto_la_SOURCES += engine/tb_dh.c -libcrypto_la_SOURCES += engine/tb_digest.c -libcrypto_la_SOURCES += engine/tb_dsa.c -libcrypto_la_SOURCES += engine/tb_ecdh.c -libcrypto_la_SOURCES += engine/tb_ecdsa.c -libcrypto_la_SOURCES += engine/tb_eckey.c -libcrypto_la_SOURCES += engine/tb_pkmeth.c -libcrypto_la_SOURCES += engine/tb_rand.c -libcrypto_la_SOURCES += engine/tb_rsa.c -libcrypto_la_SOURCES += engine/tb_store.c -noinst_HEADERS += engine/eng_int.h # err libcrypto_la_SOURCES += err/err.c @@ -732,17 +686,13 @@ noinst_HEADERS += hidden/openssl/cast.h noinst_HEADERS += hidden/openssl/chacha.h noinst_HEADERS += hidden/openssl/cmac.h noinst_HEADERS += hidden/openssl/cms.h -noinst_HEADERS += hidden/openssl/comp.h noinst_HEADERS += hidden/openssl/conf_api.h noinst_HEADERS += hidden/openssl/crypto.h noinst_HEADERS += hidden/openssl/ct.h noinst_HEADERS += hidden/openssl/curve25519.h noinst_HEADERS += hidden/openssl/dh.h noinst_HEADERS += hidden/openssl/dsa.h -noinst_HEADERS += hidden/openssl/dso.h noinst_HEADERS += hidden/openssl/ec.h -noinst_HEADERS += hidden/openssl/ecdh.h -noinst_HEADERS += hidden/openssl/ecdsa.h noinst_HEADERS += hidden/openssl/err.h noinst_HEADERS += hidden/openssl/gost.h noinst_HEADERS += hidden/openssl/hkdf.h @@ -798,12 +748,10 @@ libcrypto_la_SOURCES += lhash/lh_stats.c libcrypto_la_SOURCES += lhash/lhash.c # md4 -libcrypto_la_SOURCES += md4/md4_dgst.c -libcrypto_la_SOURCES += md4/md4_one.c +libcrypto_la_SOURCES += md4/md4.c # md5 -libcrypto_la_SOURCES += md5/md5_dgst.c -libcrypto_la_SOURCES += md5/md5_one.c +libcrypto_la_SOURCES += md5/md5.c # modes libcrypto_la_SOURCES += modes/cbc128.c @@ -897,8 +845,7 @@ noinst_HEADERS += rc2/rc2_local.h noinst_HEADERS += rc4/rc4_local.h # ripemd -libcrypto_la_SOURCES += ripemd/rmd_dgst.c -libcrypto_la_SOURCES += ripemd/rmd_one.c +libcrypto_la_SOURCES += ripemd/ripemd.c noinst_HEADERS += ripemd/rmdconst.h # rsa diff --git a/update.sh b/update.sh index 0c1a749..ef40eed 100755 --- a/update.sh +++ b/update.sh @@ -133,7 +133,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h pem/pem2.h hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h x509/x509v3.h conf/conf.h ocsp/ocsp.h - aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h + aes/aes.h modes/modes.h asn1/asn1t.h bf/blowfish.h bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h conf/conf_api.h des/des.h dh/dh.h dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.h