aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkinichiro <kinichiro.inoguchi@gmail.com>2020-06-06 01:34:59 +0900
committerkinichiro <kinichiro.inoguchi@gmail.com>2020-06-10 20:50:04 +0900
commit61a1f6a57b9a324047c00410cc98c387df8c455d (patch)
tree362d2d743a96f78724f4b1910a0b83be1fb4a22d
parent902e57b57d89ad15d3ca788d3a5cad5ae48427d2 (diff)
downloadportable-61a1f6a57b9a324047c00410cc98c387df8c455d.tar.gz
portable-61a1f6a57b9a324047c00410cc98c387df8c455d.tar.bz2
portable-61a1f6a57b9a324047c00410cc98c387df8c455d.zip
Move crypto/x509v3/ files to crypto/x509/
-rw-r--r--crypto/CMakeLists.txt67
-rw-r--r--crypto/Makefile.am75
-rwxr-xr-xupdate.sh2
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(
721 x509/by_dir.c 721 x509/by_dir.c
722 x509/by_file.c 722 x509/by_file.c
723 x509/by_mem.c 723 x509/by_mem.c
724 x509/pcy_cache.c
725 x509/pcy_data.c
726 x509/pcy_lib.c
727 x509/pcy_map.c
728 x509/pcy_node.c
729 x509/pcy_tree.c
730 x509/x509_akey.c
731 x509/x509_akeya.c
732 x509/x509_alt.c
724 x509/x509_att.c 733 x509/x509_att.c
734 x509/x509_bcons.c
735 x509/x509_bitst.c
725 x509/x509_cmp.c 736 x509/x509_cmp.c
737 x509/x509_conf.c
738 x509/x509_cpols.c
739 x509/x509_crld.c
726 x509/x509_d2.c 740 x509/x509_d2.c
727 x509/x509_def.c 741 x509/x509_def.c
742 x509/x509_enum.c
728 x509/x509_err.c 743 x509/x509_err.c
729 x509/x509_ext.c 744 x509/x509_ext.c
745 x509/x509_extku.c
746 x509/x509_genn.c
747 x509/x509_ia5.c
748 x509/x509_info.c
749 x509/x509_int.c
750 x509/x509_lib.c
730 x509/x509_lu.c 751 x509/x509_lu.c
752 x509/x509_ncons.c
731 x509/x509_obj.c 753 x509/x509_obj.c
754 x509/x509_ocsp.c
755 x509/x509_pci.c
756 x509/x509_pcia.c
757 x509/x509_pcons.c
758 x509/x509_pku.c
759 x509/x509_pmaps.c
760 x509/x509_prn.c
761 x509/x509_purp.c
732 x509/x509_r2x.c 762 x509/x509_r2x.c
733 x509/x509_req.c 763 x509/x509_req.c
734 x509/x509_set.c 764 x509/x509_set.c
765 x509/x509_skey.c
766 x509/x509_sxnet.c
735 x509/x509_trs.c 767 x509/x509_trs.c
736 x509/x509_txt.c 768 x509/x509_txt.c
769 x509/x509_utl.c
737 x509/x509_v3.c 770 x509/x509_v3.c
738 x509/x509_vfy.c 771 x509/x509_vfy.c
739 x509/x509_vpm.c 772 x509/x509_vpm.c
@@ -743,40 +776,6 @@ set(
743 x509/x509spki.c 776 x509/x509spki.c
744 x509/x509type.c 777 x509/x509type.c
745 x509/x_all.c 778 x509/x_all.c
746 x509v3/pcy_cache.c
747 x509v3/pcy_data.c
748 x509v3/pcy_lib.c
749 x509v3/pcy_map.c
750 x509v3/pcy_node.c
751 x509v3/pcy_tree.c
752 x509v3/v3_akey.c
753 x509v3/v3_akeya.c
754 x509v3/v3_alt.c
755 x509v3/v3_bcons.c
756 x509v3/v3_bitst.c
757 x509v3/v3_conf.c
758 x509v3/v3_cpols.c
759 x509v3/v3_crld.c
760 x509v3/v3_enum.c
761 x509v3/v3_extku.c
762 x509v3/v3_genn.c
763 x509v3/v3_ia5.c
764 x509v3/v3_info.c
765 x509v3/v3_int.c
766 x509v3/v3_lib.c
767 x509v3/v3_ncons.c
768 x509v3/v3_ocsp.c
769 x509v3/v3_pci.c
770 x509v3/v3_pcia.c
771 x509v3/v3_pcons.c
772 x509v3/v3_pku.c
773 x509v3/v3_pmaps.c
774 x509v3/v3_prn.c
775 x509v3/v3_purp.c
776 x509v3/v3_skey.c
777 x509v3/v3_sxnet.c
778 x509v3/v3_utl.c
779 x509v3/v3err.c
780) 779)
781 780
782if(UNIX) 781if(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
904libcrypto_la_SOURCES += x509/by_dir.c 904libcrypto_la_SOURCES += x509/by_dir.c
905libcrypto_la_SOURCES += x509/by_file.c 905libcrypto_la_SOURCES += x509/by_file.c
906libcrypto_la_SOURCES += x509/by_mem.c 906libcrypto_la_SOURCES += x509/by_mem.c
907libcrypto_la_SOURCES += x509/pcy_cache.c
908libcrypto_la_SOURCES += x509/pcy_data.c
909libcrypto_la_SOURCES += x509/pcy_lib.c
910libcrypto_la_SOURCES += x509/pcy_map.c
911libcrypto_la_SOURCES += x509/pcy_node.c
912libcrypto_la_SOURCES += x509/pcy_tree.c
913libcrypto_la_SOURCES += x509/x509_akey.c
914libcrypto_la_SOURCES += x509/x509_akeya.c
915libcrypto_la_SOURCES += x509/x509_alt.c
907libcrypto_la_SOURCES += x509/x509_att.c 916libcrypto_la_SOURCES += x509/x509_att.c
917libcrypto_la_SOURCES += x509/x509_bcons.c
918libcrypto_la_SOURCES += x509/x509_bitst.c
908libcrypto_la_SOURCES += x509/x509_cmp.c 919libcrypto_la_SOURCES += x509/x509_cmp.c
920libcrypto_la_SOURCES += x509/x509_conf.c
921libcrypto_la_SOURCES += x509/x509_cpols.c
922libcrypto_la_SOURCES += x509/x509_crld.c
909libcrypto_la_SOURCES += x509/x509_d2.c 923libcrypto_la_SOURCES += x509/x509_d2.c
910libcrypto_la_SOURCES += x509/x509_def.c 924libcrypto_la_SOURCES += x509/x509_def.c
925libcrypto_la_SOURCES += x509/x509_enum.c
911libcrypto_la_SOURCES += x509/x509_err.c 926libcrypto_la_SOURCES += x509/x509_err.c
912libcrypto_la_SOURCES += x509/x509_ext.c 927libcrypto_la_SOURCES += x509/x509_ext.c
928libcrypto_la_SOURCES += x509/x509_extku.c
929libcrypto_la_SOURCES += x509/x509_genn.c
930libcrypto_la_SOURCES += x509/x509_ia5.c
931libcrypto_la_SOURCES += x509/x509_info.c
932libcrypto_la_SOURCES += x509/x509_int.c
933libcrypto_la_SOURCES += x509/x509_lib.c
913libcrypto_la_SOURCES += x509/x509_lu.c 934libcrypto_la_SOURCES += x509/x509_lu.c
935libcrypto_la_SOURCES += x509/x509_ncons.c
914libcrypto_la_SOURCES += x509/x509_obj.c 936libcrypto_la_SOURCES += x509/x509_obj.c
937libcrypto_la_SOURCES += x509/x509_ocsp.c
938libcrypto_la_SOURCES += x509/x509_pci.c
939libcrypto_la_SOURCES += x509/x509_pcia.c
940libcrypto_la_SOURCES += x509/x509_pcons.c
941libcrypto_la_SOURCES += x509/x509_pku.c
942libcrypto_la_SOURCES += x509/x509_pmaps.c
943libcrypto_la_SOURCES += x509/x509_prn.c
944libcrypto_la_SOURCES += x509/x509_purp.c
915libcrypto_la_SOURCES += x509/x509_r2x.c 945libcrypto_la_SOURCES += x509/x509_r2x.c
916libcrypto_la_SOURCES += x509/x509_req.c 946libcrypto_la_SOURCES += x509/x509_req.c
917libcrypto_la_SOURCES += x509/x509_set.c 947libcrypto_la_SOURCES += x509/x509_set.c
948libcrypto_la_SOURCES += x509/x509_skey.c
949libcrypto_la_SOURCES += x509/x509_sxnet.c
918libcrypto_la_SOURCES += x509/x509_trs.c 950libcrypto_la_SOURCES += x509/x509_trs.c
919libcrypto_la_SOURCES += x509/x509_txt.c 951libcrypto_la_SOURCES += x509/x509_txt.c
952libcrypto_la_SOURCES += x509/x509_utl.c
920libcrypto_la_SOURCES += x509/x509_v3.c 953libcrypto_la_SOURCES += x509/x509_v3.c
921libcrypto_la_SOURCES += x509/x509_vfy.c 954libcrypto_la_SOURCES += x509/x509_vfy.c
922libcrypto_la_SOURCES += x509/x509_vpm.c 955libcrypto_la_SOURCES += x509/x509_vpm.c
@@ -926,43 +959,7 @@ libcrypto_la_SOURCES += x509/x509rset.c
926libcrypto_la_SOURCES += x509/x509spki.c 959libcrypto_la_SOURCES += x509/x509spki.c
927libcrypto_la_SOURCES += x509/x509type.c 960libcrypto_la_SOURCES += x509/x509type.c
928libcrypto_la_SOURCES += x509/x_all.c 961libcrypto_la_SOURCES += x509/x_all.c
929noinst_HEADERS += x509/x509_lcl.h 962noinst_HEADERS += x509/ext_dat.h
963noinst_HEADERS += x509/pcy_int.h
930noinst_HEADERS += x509/vpm_int.h 964noinst_HEADERS += x509/vpm_int.h
931 965noinst_HEADERS += x509/x509_lcl.h
932# x509v3
933libcrypto_la_SOURCES += x509v3/pcy_cache.c
934libcrypto_la_SOURCES += x509v3/pcy_data.c
935libcrypto_la_SOURCES += x509v3/pcy_lib.c
936libcrypto_la_SOURCES += x509v3/pcy_map.c
937libcrypto_la_SOURCES += x509v3/pcy_node.c
938libcrypto_la_SOURCES += x509v3/pcy_tree.c
939libcrypto_la_SOURCES += x509v3/v3_akey.c
940libcrypto_la_SOURCES += x509v3/v3_akeya.c
941libcrypto_la_SOURCES += x509v3/v3_alt.c
942libcrypto_la_SOURCES += x509v3/v3_bcons.c
943libcrypto_la_SOURCES += x509v3/v3_bitst.c
944libcrypto_la_SOURCES += x509v3/v3_conf.c
945libcrypto_la_SOURCES += x509v3/v3_cpols.c
946libcrypto_la_SOURCES += x509v3/v3_crld.c
947libcrypto_la_SOURCES += x509v3/v3_enum.c
948libcrypto_la_SOURCES += x509v3/v3_extku.c
949libcrypto_la_SOURCES += x509v3/v3_genn.c
950libcrypto_la_SOURCES += x509v3/v3_ia5.c
951libcrypto_la_SOURCES += x509v3/v3_info.c
952libcrypto_la_SOURCES += x509v3/v3_int.c
953libcrypto_la_SOURCES += x509v3/v3_lib.c
954libcrypto_la_SOURCES += x509v3/v3_ncons.c
955libcrypto_la_SOURCES += x509v3/v3_ocsp.c
956libcrypto_la_SOURCES += x509v3/v3_pci.c
957libcrypto_la_SOURCES += x509v3/v3_pcia.c
958libcrypto_la_SOURCES += x509v3/v3_pcons.c
959libcrypto_la_SOURCES += x509v3/v3_pku.c
960libcrypto_la_SOURCES += x509v3/v3_pmaps.c
961libcrypto_la_SOURCES += x509v3/v3_prn.c
962libcrypto_la_SOURCES += x509v3/v3_purp.c
963libcrypto_la_SOURCES += x509v3/v3_skey.c
964libcrypto_la_SOURCES += x509v3/v3_sxnet.c
965libcrypto_la_SOURCES += x509v3/v3_utl.c
966libcrypto_la_SOURCES += x509v3/v3err.c
967noinst_HEADERS += x509v3/ext_dat.h
968noinst_HEADERS += x509v3/pcy_int.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
126 objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h 126 objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h
127 ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h 127 ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h
128 pem/pem2.h hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h 128 pem/pem2.h hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h
129 x509v3/x509v3.h conf/conf.h ocsp/ocsp.h 129 x509/x509v3.h conf/conf.h ocsp/ocsp.h
130 aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h 130 aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h
131 bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h conf/conf_api.h des/des.h dh/dh.h 131 bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h conf/conf_api.h des/des.h dh/dh.h
132 dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h 132 dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h