From 61a1f6a57b9a324047c00410cc98c387df8c455d Mon Sep 17 00:00:00 2001 From: kinichiro Date: Sat, 6 Jun 2020 01:34:59 +0900 Subject: [PATCH] Move crypto/x509v3/ files to crypto/x509/ --- crypto/CMakeLists.txt | 67 +++++++++++++++++++------------------- crypto/Makefile.am | 75 +++++++++++++++++++++---------------------- update.sh | 2 +- 3 files changed, 70 insertions(+), 74 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 7867249..4c5a143 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -721,19 +721,52 @@ set( x509/by_dir.c x509/by_file.c x509/by_mem.c + x509/pcy_cache.c + x509/pcy_data.c + x509/pcy_lib.c + x509/pcy_map.c + x509/pcy_node.c + x509/pcy_tree.c + x509/x509_akey.c + x509/x509_akeya.c + x509/x509_alt.c x509/x509_att.c + x509/x509_bcons.c + x509/x509_bitst.c x509/x509_cmp.c + x509/x509_conf.c + x509/x509_cpols.c + x509/x509_crld.c x509/x509_d2.c x509/x509_def.c + x509/x509_enum.c x509/x509_err.c x509/x509_ext.c + x509/x509_extku.c + x509/x509_genn.c + x509/x509_ia5.c + x509/x509_info.c + x509/x509_int.c + x509/x509_lib.c x509/x509_lu.c + x509/x509_ncons.c x509/x509_obj.c + x509/x509_ocsp.c + x509/x509_pci.c + x509/x509_pcia.c + x509/x509_pcons.c + x509/x509_pku.c + x509/x509_pmaps.c + x509/x509_prn.c + x509/x509_purp.c x509/x509_r2x.c x509/x509_req.c x509/x509_set.c + x509/x509_skey.c + x509/x509_sxnet.c x509/x509_trs.c x509/x509_txt.c + x509/x509_utl.c x509/x509_v3.c x509/x509_vfy.c x509/x509_vpm.c @@ -743,40 +776,6 @@ set( x509/x509spki.c x509/x509type.c x509/x_all.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 - x509v3/v3err.c ) if(UNIX) diff --git a/crypto/Makefile.am b/crypto/Makefile.am index b897c00..6f9887b 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -904,19 +904,52 @@ noinst_HEADERS += whrlpool/wp_locl.h libcrypto_la_SOURCES += x509/by_dir.c libcrypto_la_SOURCES += x509/by_file.c libcrypto_la_SOURCES += x509/by_mem.c +libcrypto_la_SOURCES += x509/pcy_cache.c +libcrypto_la_SOURCES += x509/pcy_data.c +libcrypto_la_SOURCES += x509/pcy_lib.c +libcrypto_la_SOURCES += x509/pcy_map.c +libcrypto_la_SOURCES += x509/pcy_node.c +libcrypto_la_SOURCES += x509/pcy_tree.c +libcrypto_la_SOURCES += x509/x509_akey.c +libcrypto_la_SOURCES += x509/x509_akeya.c +libcrypto_la_SOURCES += x509/x509_alt.c libcrypto_la_SOURCES += x509/x509_att.c +libcrypto_la_SOURCES += x509/x509_bcons.c +libcrypto_la_SOURCES += x509/x509_bitst.c libcrypto_la_SOURCES += x509/x509_cmp.c +libcrypto_la_SOURCES += x509/x509_conf.c +libcrypto_la_SOURCES += x509/x509_cpols.c +libcrypto_la_SOURCES += x509/x509_crld.c libcrypto_la_SOURCES += x509/x509_d2.c libcrypto_la_SOURCES += x509/x509_def.c +libcrypto_la_SOURCES += x509/x509_enum.c libcrypto_la_SOURCES += x509/x509_err.c libcrypto_la_SOURCES += x509/x509_ext.c +libcrypto_la_SOURCES += x509/x509_extku.c +libcrypto_la_SOURCES += x509/x509_genn.c +libcrypto_la_SOURCES += x509/x509_ia5.c +libcrypto_la_SOURCES += x509/x509_info.c +libcrypto_la_SOURCES += x509/x509_int.c +libcrypto_la_SOURCES += x509/x509_lib.c libcrypto_la_SOURCES += x509/x509_lu.c +libcrypto_la_SOURCES += x509/x509_ncons.c libcrypto_la_SOURCES += x509/x509_obj.c +libcrypto_la_SOURCES += x509/x509_ocsp.c +libcrypto_la_SOURCES += x509/x509_pci.c +libcrypto_la_SOURCES += x509/x509_pcia.c +libcrypto_la_SOURCES += x509/x509_pcons.c +libcrypto_la_SOURCES += x509/x509_pku.c +libcrypto_la_SOURCES += x509/x509_pmaps.c +libcrypto_la_SOURCES += x509/x509_prn.c +libcrypto_la_SOURCES += x509/x509_purp.c libcrypto_la_SOURCES += x509/x509_r2x.c libcrypto_la_SOURCES += x509/x509_req.c libcrypto_la_SOURCES += x509/x509_set.c +libcrypto_la_SOURCES += x509/x509_skey.c +libcrypto_la_SOURCES += x509/x509_sxnet.c libcrypto_la_SOURCES += x509/x509_trs.c libcrypto_la_SOURCES += x509/x509_txt.c +libcrypto_la_SOURCES += x509/x509_utl.c libcrypto_la_SOURCES += x509/x509_v3.c libcrypto_la_SOURCES += x509/x509_vfy.c libcrypto_la_SOURCES += x509/x509_vpm.c @@ -926,43 +959,7 @@ libcrypto_la_SOURCES += x509/x509rset.c libcrypto_la_SOURCES += x509/x509spki.c libcrypto_la_SOURCES += x509/x509type.c libcrypto_la_SOURCES += x509/x_all.c -noinst_HEADERS += x509/x509_lcl.h +noinst_HEADERS += x509/ext_dat.h +noinst_HEADERS += x509/pcy_int.h noinst_HEADERS += x509/vpm_int.h - -# x509v3 -libcrypto_la_SOURCES += x509v3/pcy_cache.c -libcrypto_la_SOURCES += x509v3/pcy_data.c -libcrypto_la_SOURCES += x509v3/pcy_lib.c -libcrypto_la_SOURCES += x509v3/pcy_map.c -libcrypto_la_SOURCES += x509v3/pcy_node.c -libcrypto_la_SOURCES += x509v3/pcy_tree.c -libcrypto_la_SOURCES += x509v3/v3_akey.c -libcrypto_la_SOURCES += x509v3/v3_akeya.c -libcrypto_la_SOURCES += x509v3/v3_alt.c -libcrypto_la_SOURCES += x509v3/v3_bcons.c -libcrypto_la_SOURCES += x509v3/v3_bitst.c -libcrypto_la_SOURCES += x509v3/v3_conf.c -libcrypto_la_SOURCES += x509v3/v3_cpols.c -libcrypto_la_SOURCES += x509v3/v3_crld.c -libcrypto_la_SOURCES += x509v3/v3_enum.c -libcrypto_la_SOURCES += x509v3/v3_extku.c -libcrypto_la_SOURCES += x509v3/v3_genn.c -libcrypto_la_SOURCES += x509v3/v3_ia5.c -libcrypto_la_SOURCES += x509v3/v3_info.c -libcrypto_la_SOURCES += x509v3/v3_int.c -libcrypto_la_SOURCES += x509v3/v3_lib.c -libcrypto_la_SOURCES += x509v3/v3_ncons.c -libcrypto_la_SOURCES += x509v3/v3_ocsp.c -libcrypto_la_SOURCES += x509v3/v3_pci.c -libcrypto_la_SOURCES += x509v3/v3_pcia.c -libcrypto_la_SOURCES += x509v3/v3_pcons.c -libcrypto_la_SOURCES += x509v3/v3_pku.c -libcrypto_la_SOURCES += x509v3/v3_pmaps.c -libcrypto_la_SOURCES += x509v3/v3_prn.c -libcrypto_la_SOURCES += x509v3/v3_purp.c -libcrypto_la_SOURCES += x509v3/v3_skey.c -libcrypto_la_SOURCES += x509v3/v3_sxnet.c -libcrypto_la_SOURCES += x509v3/v3_utl.c -libcrypto_la_SOURCES += x509v3/v3err.c -noinst_HEADERS += x509v3/ext_dat.h -noinst_HEADERS += x509v3/pcy_int.h +noinst_HEADERS += x509/x509_lcl.h diff --git a/update.sh b/update.sh index 3f8940d..bf12bee 100755 --- a/update.sh +++ b/update.sh @@ -126,7 +126,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.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 - x509v3/x509v3.h conf/conf.h ocsp/ocsp.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 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