From 681ff277209a7429b17dc7d2650d8a45a28cc5d8 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Wed, 5 Sep 2018 16:40:13 -0500 Subject: [PATCH] Flatten most of the crypto target. The fipsmodule is still separate as that's a lot of build mess. (Though that too may be worth pulling in eventually. CMake usually has different opinions on generated files if they're in the same directory. We might be able to avoid the set_source_properties(GENERATED) thing.) Change-Id: Ie1f9345009044d4f0e7541ca779e01bdc5ad62f6 Reviewed-on: https://boringssl-review.googlesource.com/31586 Reviewed-by: Adam Langley --- CMakeLists.txt | 1 - crypto/CMakeLists.txt | 360 ++++++++++++++++++++--------- crypto/asn1/CMakeLists.txt | 38 --- crypto/base64/CMakeLists.txt | 9 - crypto/bio/CMakeLists.txt | 18 -- crypto/bn_extra/CMakeLists.txt | 10 - crypto/buf/CMakeLists.txt | 9 - crypto/bytestring/CMakeLists.txt | 13 -- crypto/chacha/CMakeLists.txt | 9 - crypto/cipher_extra/CMakeLists.txt | 21 -- crypto/cmac/CMakeLists.txt | 9 - crypto/conf/CMakeLists.txt | 9 - crypto/curve25519/CMakeLists.txt | 9 - crypto/dh/CMakeLists.txt | 12 - crypto/digest_extra/CMakeLists.txt | 9 - crypto/dsa/CMakeLists.txt | 10 - crypto/ec_extra/CMakeLists.txt | 9 - crypto/ecdh_extra/CMakeLists.txt | 9 - crypto/ecdsa_extra/CMakeLists.txt | 9 - crypto/engine/CMakeLists.txt | 9 - crypto/err/CMakeLists.txt | 40 ---- crypto/evp/CMakeLists.txt | 23 -- crypto/hkdf/CMakeLists.txt | 9 - crypto/lhash/CMakeLists.txt | 9 - crypto/obj/CMakeLists.txt | 10 - crypto/pem/CMakeLists.txt | 16 -- crypto/pkcs7/CMakeLists.txt | 10 - crypto/pkcs8/CMakeLists.txt | 11 - crypto/poly1305/CMakeLists.txt | 11 - crypto/pool/CMakeLists.txt | 9 - crypto/rand_extra/CMakeLists.txt | 13 -- crypto/rc4/CMakeLists.txt | 9 - crypto/rsa_extra/CMakeLists.txt | 10 - crypto/stack/CMakeLists.txt | 9 - crypto/x509/CMakeLists.txt | 57 ----- crypto/x509v3/CMakeLists.txt | 45 ---- 36 files changed, 252 insertions(+), 621 deletions(-) delete mode 100644 crypto/asn1/CMakeLists.txt delete mode 100644 crypto/base64/CMakeLists.txt delete mode 100644 crypto/bio/CMakeLists.txt delete mode 100644 crypto/bn_extra/CMakeLists.txt delete mode 100644 crypto/buf/CMakeLists.txt delete mode 100644 crypto/bytestring/CMakeLists.txt delete mode 100644 crypto/chacha/CMakeLists.txt delete mode 100644 crypto/cipher_extra/CMakeLists.txt delete mode 100644 crypto/cmac/CMakeLists.txt delete mode 100644 crypto/conf/CMakeLists.txt delete mode 100644 crypto/curve25519/CMakeLists.txt delete mode 100644 crypto/dh/CMakeLists.txt delete mode 100644 crypto/digest_extra/CMakeLists.txt delete mode 100644 crypto/dsa/CMakeLists.txt delete mode 100644 crypto/ec_extra/CMakeLists.txt delete mode 100644 crypto/ecdh_extra/CMakeLists.txt delete mode 100644 crypto/ecdsa_extra/CMakeLists.txt delete mode 100644 crypto/engine/CMakeLists.txt delete mode 100644 crypto/err/CMakeLists.txt delete mode 100644 crypto/evp/CMakeLists.txt delete mode 100644 crypto/hkdf/CMakeLists.txt delete mode 100644 crypto/lhash/CMakeLists.txt delete mode 100644 crypto/obj/CMakeLists.txt delete mode 100644 crypto/pem/CMakeLists.txt delete mode 100644 crypto/pkcs7/CMakeLists.txt delete mode 100644 crypto/pkcs8/CMakeLists.txt delete mode 100644 crypto/poly1305/CMakeLists.txt delete mode 100644 crypto/pool/CMakeLists.txt delete mode 100644 crypto/rand_extra/CMakeLists.txt delete mode 100644 crypto/rc4/CMakeLists.txt delete mode 100644 crypto/rsa_extra/CMakeLists.txt delete mode 100644 crypto/stack/CMakeLists.txt delete mode 100644 crypto/x509/CMakeLists.txt delete mode 100644 crypto/x509v3/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index b9e01017..21c7f016 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -442,7 +442,6 @@ add_custom_command( add_library(crypto_test_data OBJECT crypto_test_data.cc) add_subdirectory(crypto) -add_subdirectory(third_party/fiat) add_subdirectory(ssl) add_subdirectory(ssl/test) add_subdirectory(fipstools) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 929aec29..86da2076 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -78,78 +78,8 @@ function(perlasm dest src) ) endfunction() -# Level 0.1 - depends on nothing outside this set. -add_subdirectory(stack) -add_subdirectory(lhash) -add_subdirectory(err) -add_subdirectory(buf) -add_subdirectory(base64) -add_subdirectory(bytestring) -add_subdirectory(pool) - -# Level 0.2 - depends on nothing but itself -add_subdirectory(rc4) -add_subdirectory(conf) -add_subdirectory(chacha) -add_subdirectory(poly1305) -add_subdirectory(curve25519) - -# Level 1, depends only on 0.* -add_subdirectory(digest_extra) -add_subdirectory(cipher_extra) -add_subdirectory(rand_extra) -add_subdirectory(bio) -add_subdirectory(bn_extra) -add_subdirectory(obj) -add_subdirectory(asn1) - -# Level 2 -add_subdirectory(engine) -add_subdirectory(dh) -add_subdirectory(dsa) -add_subdirectory(rsa_extra) -add_subdirectory(ec_extra) -add_subdirectory(ecdh_extra) -add_subdirectory(ecdsa_extra) - -# Level 3 -add_subdirectory(cmac) -add_subdirectory(evp) -add_subdirectory(hkdf) -add_subdirectory(pem) -add_subdirectory(x509) -add_subdirectory(x509v3) - -# Level 4 -add_subdirectory(pkcs7) -add_subdirectory(pkcs8) - -# Test support code -add_subdirectory(test) - add_subdirectory(fipsmodule) - -add_library( - crypto_base - - OBJECT - - cpu-aarch64-fuchsia.c - cpu-aarch64-linux.c - cpu-arm.c - cpu-arm-linux.c - cpu-intel.c - cpu-ppc64le.c - crypto.c - ex_data.c - mem.c - refcount_c11.c - refcount_lock.c - thread.c - thread_none.c - thread_pthread.c - thread_win.c -) +add_subdirectory(test) if(FIPS_DELOCATE) SET_SOURCE_FILES_PROPERTIES(fipsmodule/bcm.o PROPERTIES EXTERNAL_OBJECT true) @@ -205,46 +135,261 @@ perlasm(chacha/chacha-x86_64.${ASM_EXT} chacha/asm/chacha-x86_64.pl) perlasm(cipher_extra/aes128gcmsiv-x86_64.${ASM_EXT} cipher_extra/asm/aes128gcmsiv-x86_64.pl) perlasm(cipher_extra/chacha20_poly1305_x86_64.${ASM_EXT} cipher_extra/asm/chacha20_poly1305_x86_64.pl) +add_custom_command( + OUTPUT err_data.c + COMMAND ${GO_EXECUTABLE} run err_data_generate.go > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c + DEPENDS + err/err_data_generate.go + err/asn1.errordata + err/bio.errordata + err/bn.errordata + err/cipher.errordata + err/conf.errordata + err/dh.errordata + err/digest.errordata + err/dsa.errordata + err/ecdh.errordata + err/ecdsa.errordata + err/ec.errordata + err/engine.errordata + err/evp.errordata + err/hkdf.errordata + err/obj.errordata + err/pem.errordata + err/pkcs7.errordata + err/pkcs8.errordata + err/rsa.errordata + err/ssl.errordata + err/x509.errordata + err/x509v3.errordata + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/err +) + add_library( crypto - $ - $ - $ - $ - $ - $ - $ + asn1/a_bitstr.c + asn1/a_bool.c + asn1/a_d2i_fp.c + asn1/a_dup.c + asn1/a_enum.c + asn1/a_gentm.c + asn1/a_i2d_fp.c + asn1/a_int.c + asn1/a_mbstr.c + asn1/a_object.c + asn1/a_octet.c + asn1/a_print.c + asn1/a_strnid.c + asn1/a_time.c + asn1/a_type.c + asn1/a_utctm.c + asn1/a_utf8.c + asn1/asn1_lib.c + asn1/asn1_par.c + asn1/asn_pack.c + asn1/f_enum.c + asn1/f_int.c + asn1/f_string.c + asn1/tasn_dec.c + asn1/tasn_enc.c + asn1/tasn_fre.c + asn1/tasn_new.c + asn1/tasn_typ.c + asn1/tasn_utl.c + asn1/time_support.c + base64/base64.c + bio/bio.c + bio/bio_mem.c + bio/connect.c + bio/fd.c + bio/file.c + bio/hexdump.c + bio/pair.c + bio/printf.c + bio/socket.c + bio/socket_helper.c + bn_extra/bn_asn1.c + bn_extra/convert.c + buf/buf.c + bytestring/asn1_compat.c + bytestring/ber.c + bytestring/cbb.c + bytestring/cbs.c + bytestring/unicode.c + chacha/chacha.c + cipher_extra/cipher_extra.c + cipher_extra/derive_key.c + cipher_extra/e_aesccm.c + cipher_extra/e_aesctrhmac.c + cipher_extra/e_aesgcmsiv.c + cipher_extra/e_chacha20poly1305.c + cipher_extra/e_null.c + cipher_extra/e_rc2.c + cipher_extra/e_rc4.c + cipher_extra/e_tls.c + cipher_extra/tls_cbc.c + cmac/cmac.c + conf/conf.c + cpu-aarch64-fuchsia.c + cpu-aarch64-linux.c + cpu-arm-linux.c + cpu-arm.c + cpu-intel.c + cpu-ppc64le.c + crypto.c + curve25519/spake25519.c + dh/dh.c + dh/params.c + dh/check.c + dh/dh_asn1.c + digest_extra/digest_extra.c + dsa/dsa.c + dsa/dsa_asn1.c + ecdh_extra/ecdh_extra.c + ecdsa_extra/ecdsa_asn1.c + ec_extra/ec_asn1.c + err/err.c + err_data.c + engine/engine.c + evp/digestsign.c + evp/evp.c + evp/evp_asn1.c + evp/evp_ctx.c + evp/p_dsa_asn1.c + evp/p_ec.c + evp/p_ec_asn1.c + evp/p_ed25519.c + evp/p_ed25519_asn1.c + evp/p_rsa.c + evp/p_rsa_asn1.c + evp/pbkdf.c + evp/print.c + evp/scrypt.c + evp/sign.c + ex_data.c + hkdf/hkdf.c + lhash/lhash.c + mem.c + obj/obj.c + obj/obj_xref.c + pem/pem_all.c + pem/pem_info.c + pem/pem_lib.c + pem/pem_oth.c + pem/pem_pk8.c + pem/pem_pkey.c + pem/pem_x509.c + pem/pem_xaux.c + pkcs7/pkcs7.c + pkcs7/pkcs7_x509.c + pkcs8/pkcs8.c + pkcs8/pkcs8_x509.c + pkcs8/p5_pbev2.c + poly1305/poly1305.c + poly1305/poly1305_arm.c + poly1305/poly1305_vec.c + pool/pool.c + rand_extra/deterministic.c + rand_extra/forkunsafe.c + rand_extra/fuchsia.c + rand_extra/rand_extra.c + rand_extra/windows.c + rc4/rc4.c + refcount_c11.c + refcount_lock.c + rsa_extra/rsa_asn1.c + rsa_extra/rsa_print.c + stack/stack.c + thread.c + thread_none.c + thread_pthread.c + thread_win.c + x509/a_digest.c + x509/a_sign.c + x509/a_strex.c + x509/a_verify.c + x509/algorithm.c + x509/asn1_gen.c + x509/by_dir.c + x509/by_file.c + x509/i2d_pr.c + x509/rsa_pss.c + x509/t_crl.c + x509/t_req.c + x509/t_x509.c + x509/t_x509a.c + x509/x509.c + x509/x509_att.c + x509/x509_cmp.c + x509/x509_d2.c + x509/x509_def.c + x509/x509_ext.c + x509/x509_lu.c + x509/x509_obj.c + x509/x509_r2x.c + x509/x509_req.c + x509/x509_set.c + x509/x509_trs.c + x509/x509_txt.c + x509/x509_v3.c + x509/x509_vfy.c + x509/x509_vpm.c + x509/x509cset.c + x509/x509name.c + x509/x509rset.c + x509/x509spki.c + x509/x_algor.c + x509/x_all.c + x509/x_attrib.c + x509/x_crl.c + x509/x_exten.c + x509/x_info.c + x509/x_name.c + x509/x_pkey.c + x509/x_pubkey.c + x509/x_req.c + x509/x_sig.c + x509/x_spki.c + x509/x_val.c + x509/x_x509.c + x509/x_x509a.c + x509v3/pcy_cache.c + x509v3/pcy_data.c + x509v3/pcy_lib.c + x509v3/pcy_map.c + x509v3/pcy_node.c + x509v3/pcy_tree.c + x509v3/v3_akey.c + x509v3/v3_akeya.c + x509v3/v3_alt.c + x509v3/v3_bcons.c + x509v3/v3_bitst.c + x509v3/v3_conf.c + x509v3/v3_cpols.c + x509v3/v3_crld.c + x509v3/v3_enum.c + x509v3/v3_extku.c + x509v3/v3_genn.c + x509v3/v3_ia5.c + x509v3/v3_info.c + x509v3/v3_int.c + x509v3/v3_lib.c + x509v3/v3_ncons.c + x509v3/v3_ocsp.c + x509v3/v3_pci.c + x509v3/v3_pcia.c + x509v3/v3_pcons.c + x509v3/v3_pku.c + x509v3/v3_pmaps.c + x509v3/v3_prn.c + x509v3/v3_purp.c + x509v3/v3_skey.c + x509v3/v3_sxnet.c + x509v3/v3_utl.c + ../../third_party/fiat/curve25519.c + $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ ${CRYPTO_ARCH_SOURCES} ${CRYPTO_FIPS_OBJECTS} @@ -266,7 +411,6 @@ if(USE_CUSTOM_LIBCXX) target_link_libraries(crypto libcxx) endif() -# TODO(davidben): Convert the remaining tests to GTest. add_executable( crypto_test diff --git a/crypto/asn1/CMakeLists.txt b/crypto/asn1/CMakeLists.txt deleted file mode 100644 index de5d280e..00000000 --- a/crypto/asn1/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -include_directories(../../include) - -add_library( - asn1 - - OBJECT - - a_bitstr.c - a_bool.c - a_d2i_fp.c - a_dup.c - a_enum.c - a_gentm.c - a_i2d_fp.c - a_int.c - a_mbstr.c - a_object.c - a_octet.c - a_print.c - a_strnid.c - a_time.c - a_type.c - a_utctm.c - a_utf8.c - asn1_lib.c - asn1_par.c - asn_pack.c - f_enum.c - f_int.c - f_string.c - tasn_dec.c - tasn_enc.c - tasn_fre.c - tasn_new.c - tasn_typ.c - tasn_utl.c - time_support.c -) diff --git a/crypto/base64/CMakeLists.txt b/crypto/base64/CMakeLists.txt deleted file mode 100644 index 18cf9fe0..00000000 --- a/crypto/base64/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - base64 - - OBJECT - - base64.c -) diff --git a/crypto/bio/CMakeLists.txt b/crypto/bio/CMakeLists.txt deleted file mode 100644 index fccb1522..00000000 --- a/crypto/bio/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -include_directories(../../include) - -add_library( - bio - - OBJECT - - bio.c - bio_mem.c - connect.c - fd.c - file.c - hexdump.c - pair.c - printf.c - socket.c - socket_helper.c -) diff --git a/crypto/bn_extra/CMakeLists.txt b/crypto/bn_extra/CMakeLists.txt deleted file mode 100644 index 994b365a..00000000 --- a/crypto/bn_extra/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -include_directories(../../include) - -add_library( - bn_extra - - OBJECT - - bn_asn1.c - convert.c -) diff --git a/crypto/buf/CMakeLists.txt b/crypto/buf/CMakeLists.txt deleted file mode 100644 index 63f10255..00000000 --- a/crypto/buf/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - buf - - OBJECT - - buf.c -) diff --git a/crypto/bytestring/CMakeLists.txt b/crypto/bytestring/CMakeLists.txt deleted file mode 100644 index 2bb4c15f..00000000 --- a/crypto/bytestring/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -include_directories(../../include) - -add_library( - bytestring - - OBJECT - - asn1_compat.c - ber.c - cbs.c - cbb.c - unicode.c -) diff --git a/crypto/chacha/CMakeLists.txt b/crypto/chacha/CMakeLists.txt deleted file mode 100644 index 2e764bd1..00000000 --- a/crypto/chacha/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - chacha - - OBJECT - - chacha.c -) diff --git a/crypto/cipher_extra/CMakeLists.txt b/crypto/cipher_extra/CMakeLists.txt deleted file mode 100644 index 4ffc334d..00000000 --- a/crypto/cipher_extra/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -include_directories(../../include) - -add_library( - cipher_extra - - OBJECT - - cipher_extra.c - derive_key.c - - e_null.c - e_rc2.c - e_rc4.c - e_aesgcmsiv.c - e_aesctrhmac.c - e_aesccm.c - e_chacha20poly1305.c - - tls_cbc.c - e_tls.c -) diff --git a/crypto/cmac/CMakeLists.txt b/crypto/cmac/CMakeLists.txt deleted file mode 100644 index 44299033..00000000 --- a/crypto/cmac/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - cmac - - OBJECT - - cmac.c -) diff --git a/crypto/conf/CMakeLists.txt b/crypto/conf/CMakeLists.txt deleted file mode 100644 index 0a3c7953..00000000 --- a/crypto/conf/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - conf - - OBJECT - - conf.c -) diff --git a/crypto/curve25519/CMakeLists.txt b/crypto/curve25519/CMakeLists.txt deleted file mode 100644 index 8442aec9..00000000 --- a/crypto/curve25519/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - curve25519 - - OBJECT - - spake25519.c -) diff --git a/crypto/dh/CMakeLists.txt b/crypto/dh/CMakeLists.txt deleted file mode 100644 index 83ae6d43..00000000 --- a/crypto/dh/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -include_directories(../../include) - -add_library( - dh - - OBJECT - - dh.c - params.c - check.c - dh_asn1.c -) diff --git a/crypto/digest_extra/CMakeLists.txt b/crypto/digest_extra/CMakeLists.txt deleted file mode 100644 index 2efb832a..00000000 --- a/crypto/digest_extra/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - digest_extra - - OBJECT - - digest_extra.c -) diff --git a/crypto/dsa/CMakeLists.txt b/crypto/dsa/CMakeLists.txt deleted file mode 100644 index d3c12f58..00000000 --- a/crypto/dsa/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -include_directories(../../include) - -add_library( - dsa - - OBJECT - - dsa.c - dsa_asn1.c -) diff --git a/crypto/ec_extra/CMakeLists.txt b/crypto/ec_extra/CMakeLists.txt deleted file mode 100644 index 2312b190..00000000 --- a/crypto/ec_extra/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - ec_extra - - OBJECT - - ec_asn1.c -) diff --git a/crypto/ecdh_extra/CMakeLists.txt b/crypto/ecdh_extra/CMakeLists.txt deleted file mode 100644 index 40a53c1d..00000000 --- a/crypto/ecdh_extra/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - ecdh_extra - - OBJECT - - ecdh_extra.c -) diff --git a/crypto/ecdsa_extra/CMakeLists.txt b/crypto/ecdsa_extra/CMakeLists.txt deleted file mode 100644 index a9085808..00000000 --- a/crypto/ecdsa_extra/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - ecdsa_extra - - OBJECT - - ecdsa_asn1.c -) diff --git a/crypto/engine/CMakeLists.txt b/crypto/engine/CMakeLists.txt deleted file mode 100644 index 5667f023..00000000 --- a/crypto/engine/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - engine - - OBJECT - - engine.c -) diff --git a/crypto/err/CMakeLists.txt b/crypto/err/CMakeLists.txt deleted file mode 100644 index 91c6f6eb..00000000 --- a/crypto/err/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -include_directories(../../include) - -add_custom_command( - OUTPUT err_data.c - COMMAND ${GO_EXECUTABLE} run err_data_generate.go > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c - DEPENDS - err_data_generate.go - asn1.errordata - bio.errordata - bn.errordata - cipher.errordata - conf.errordata - dh.errordata - digest.errordata - dsa.errordata - ecdh.errordata - ecdsa.errordata - ec.errordata - engine.errordata - evp.errordata - hkdf.errordata - obj.errordata - pem.errordata - pkcs7.errordata - pkcs8.errordata - rsa.errordata - ssl.errordata - x509.errordata - x509v3.errordata - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -) - -add_library( - err - - OBJECT - - err.c - err_data.c -) diff --git a/crypto/evp/CMakeLists.txt b/crypto/evp/CMakeLists.txt deleted file mode 100644 index 4b1fe5e8..00000000 --- a/crypto/evp/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -include_directories(../../include) - -add_library( - evp - - OBJECT - - digestsign.c - evp.c - evp_asn1.c - evp_ctx.c - p_dsa_asn1.c - p_ec.c - p_ec_asn1.c - p_ed25519.c - p_ed25519_asn1.c - p_rsa.c - p_rsa_asn1.c - pbkdf.c - print.c - scrypt.c - sign.c -) diff --git a/crypto/hkdf/CMakeLists.txt b/crypto/hkdf/CMakeLists.txt deleted file mode 100644 index 43309eb1..00000000 --- a/crypto/hkdf/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - hkdf - - OBJECT - - hkdf.c -) diff --git a/crypto/lhash/CMakeLists.txt b/crypto/lhash/CMakeLists.txt deleted file mode 100644 index 7a5f161c..00000000 --- a/crypto/lhash/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - lhash - - OBJECT - - lhash.c -) diff --git a/crypto/obj/CMakeLists.txt b/crypto/obj/CMakeLists.txt deleted file mode 100644 index b8a4ef37..00000000 --- a/crypto/obj/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -include_directories(../../include) - -add_library( - obj - - OBJECT - - obj.c - obj_xref.c -) diff --git a/crypto/pem/CMakeLists.txt b/crypto/pem/CMakeLists.txt deleted file mode 100644 index 30dd7c92..00000000 --- a/crypto/pem/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -include_directories(../../include) - -add_library( - pem - - OBJECT - - pem_all.c - pem_info.c - pem_lib.c - pem_oth.c - pem_pk8.c - pem_pkey.c - pem_x509.c - pem_xaux.c -) diff --git a/crypto/pkcs7/CMakeLists.txt b/crypto/pkcs7/CMakeLists.txt deleted file mode 100644 index 65c65662..00000000 --- a/crypto/pkcs7/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -include_directories(../../include) - -add_library( - pkcs7 - - OBJECT - - pkcs7.c - pkcs7_x509.c -) diff --git a/crypto/pkcs8/CMakeLists.txt b/crypto/pkcs8/CMakeLists.txt deleted file mode 100644 index 417dce3f..00000000 --- a/crypto/pkcs8/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -include_directories(../../include) - -add_library( - pkcs8_lib - - OBJECT - - pkcs8.c - pkcs8_x509.c - p5_pbev2.c -) diff --git a/crypto/poly1305/CMakeLists.txt b/crypto/poly1305/CMakeLists.txt deleted file mode 100644 index b22281bb..00000000 --- a/crypto/poly1305/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -include_directories(../../include) - -add_library( - poly1305 - - OBJECT - - poly1305.c - poly1305_arm.c - poly1305_vec.c -) diff --git a/crypto/pool/CMakeLists.txt b/crypto/pool/CMakeLists.txt deleted file mode 100644 index 6f2c7842..00000000 --- a/crypto/pool/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - pool - - OBJECT - - pool.c -) diff --git a/crypto/rand_extra/CMakeLists.txt b/crypto/rand_extra/CMakeLists.txt deleted file mode 100644 index cdd7aa8b..00000000 --- a/crypto/rand_extra/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -include_directories(../../include) - -add_library( - rand_extra - - OBJECT - - deterministic.c - forkunsafe.c - fuchsia.c - rand_extra.c - windows.c -) diff --git a/crypto/rc4/CMakeLists.txt b/crypto/rc4/CMakeLists.txt deleted file mode 100644 index a008fe53..00000000 --- a/crypto/rc4/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - rc4 - - OBJECT - - rc4.c -) diff --git a/crypto/rsa_extra/CMakeLists.txt b/crypto/rsa_extra/CMakeLists.txt deleted file mode 100644 index b705f168..00000000 --- a/crypto/rsa_extra/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -include_directories(../../include) - -add_library( - rsa_extra - - OBJECT - - rsa_asn1.c - rsa_print.c -) diff --git a/crypto/stack/CMakeLists.txt b/crypto/stack/CMakeLists.txt deleted file mode 100644 index dcd8ef49..00000000 --- a/crypto/stack/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - stack - - OBJECT - - stack.c -) diff --git a/crypto/x509/CMakeLists.txt b/crypto/x509/CMakeLists.txt deleted file mode 100644 index 74001e7e..00000000 --- a/crypto/x509/CMakeLists.txt +++ /dev/null @@ -1,57 +0,0 @@ -include_directories(../../include) - -add_library( - x509 - - OBJECT - - a_digest.c - a_sign.c - a_strex.c - a_verify.c - algorithm.c - asn1_gen.c - by_dir.c - by_file.c - i2d_pr.c - rsa_pss.c - t_crl.c - t_req.c - t_x509.c - t_x509a.c - x509.c - x509_att.c - x509_cmp.c - x509_d2.c - x509_def.c - x509_ext.c - x509_lu.c - x509_obj.c - x509_r2x.c - x509_req.c - x509_set.c - x509_trs.c - x509_txt.c - x509_v3.c - x509_vfy.c - x509_vpm.c - x509cset.c - x509name.c - x509rset.c - x509spki.c - x_algor.c - x_all.c - x_attrib.c - x_crl.c - x_exten.c - x_info.c - x_name.c - x_pkey.c - x_pubkey.c - x_req.c - x_sig.c - x_spki.c - x_val.c - x_x509.c - x_x509a.c -) diff --git a/crypto/x509v3/CMakeLists.txt b/crypto/x509v3/CMakeLists.txt deleted file mode 100644 index 61196399..00000000 --- a/crypto/x509v3/CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -include_directories(../../include) - -add_library( - x509v3 - - OBJECT - - # v3_addr.c - disabled by upstream by default. - # v3_asid.c - disabled by upstream by default. - # v3_ocsp.c - missing OCSP for now. - - pcy_cache.c - pcy_data.c - pcy_lib.c - pcy_map.c - pcy_node.c - pcy_tree.c - v3_akey.c - v3_akeya.c - v3_alt.c - v3_bcons.c - v3_bitst.c - v3_conf.c - v3_cpols.c - v3_crld.c - v3_enum.c - v3_extku.c - v3_genn.c - v3_ia5.c - v3_info.c - v3_int.c - v3_lib.c - v3_ncons.c - v3_ocsp.c - v3_pci.c - v3_pcia.c - v3_pcons.c - v3_pku.c - v3_pmaps.c - v3_prn.c - v3_purp.c - v3_skey.c - v3_sxnet.c - v3_utl.c -)