update for asn1 changes

2 files changed, 8 insertions, 14 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index d1be1a8..12bc8ae 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -245,7 +245,6 @@ set(
         aes/aes_ofb.c
         aes/aes_wrap.c
         asn1/a_bitstr.c
-        asn1/a_bool.c
         asn1/a_d2i_fp.c
         asn1/a_digest.c
         asn1/a_dup.c
@@ -256,10 +255,11 @@ set(
         asn1/a_object.c
         asn1/a_octet.c
         asn1/a_pkey.c
-        asn1/a_pubkey.c
         asn1/a_print.c
+        asn1/a_pubkey.c
         asn1/a_sign.c
         asn1/a_strex.c
+        asn1/a_string.c
         asn1/a_strnid.c
         asn1/a_time.c
         asn1/a_time_tm.c
@@ -269,23 +269,20 @@ set(
         asn1/ameth_lib.c
         asn1/asn1_err.c
         asn1/asn1_gen.c
-        asn1/asn1_lib.c
+        asn1/asn1_old_lib.c
         asn1/asn1_par.c
+        asn1/asn1_types.c
         asn1/asn_mime.c
         asn1/asn_moid.c
         asn1/asn_pack.c
         asn1/bio_asn1.c
         asn1/bio_ndef.c
         asn1/evp_asn1.c
-        asn1/f_enum.c
-        asn1/f_int.c
-        asn1/f_string.c
         asn1/n_pkey.c
         asn1/nsseq.c
         asn1/p5_pbe.c
         asn1/p5_pbev2.c
         asn1/p8_pkey.c
-        asn1/t_bitst.c
         asn1/t_crl.c
         asn1/t_pkey.c
         asn1/t_req.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index d7b13a5..155df59 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -292,7 +292,6 @@ noinst_HEADERS += aes/aes_locl.h
 
 # asn1
 libcrypto_la_SOURCES += asn1/a_bitstr.c
-libcrypto_la_SOURCES += asn1/a_bool.c
 libcrypto_la_SOURCES += asn1/a_d2i_fp.c
 libcrypto_la_SOURCES += asn1/a_digest.c
 libcrypto_la_SOURCES += asn1/a_dup.c
@@ -303,10 +302,11 @@ libcrypto_la_SOURCES += asn1/a_mbstr.c
 libcrypto_la_SOURCES += asn1/a_object.c
 libcrypto_la_SOURCES += asn1/a_octet.c
 libcrypto_la_SOURCES += asn1/a_pkey.c
-libcrypto_la_SOURCES += asn1/a_pubkey.c
 libcrypto_la_SOURCES += asn1/a_print.c
+libcrypto_la_SOURCES += asn1/a_pubkey.c
 libcrypto_la_SOURCES += asn1/a_sign.c
 libcrypto_la_SOURCES += asn1/a_strex.c
+libcrypto_la_SOURCES += asn1/a_string.c
 libcrypto_la_SOURCES += asn1/a_strnid.c
 libcrypto_la_SOURCES += asn1/a_time.c
 libcrypto_la_SOURCES += asn1/a_time_tm.c
@@ -316,23 +316,20 @@ libcrypto_la_SOURCES += asn1/a_verify.c
 libcrypto_la_SOURCES += asn1/ameth_lib.c
 libcrypto_la_SOURCES += asn1/asn1_err.c
 libcrypto_la_SOURCES += asn1/asn1_gen.c
-libcrypto_la_SOURCES += asn1/asn1_lib.c
+libcrypto_la_SOURCES += asn1/asn1_old_lib.c
 libcrypto_la_SOURCES += asn1/asn1_par.c
+libcrypto_la_SOURCES += asn1/asn1_types.c
 libcrypto_la_SOURCES += asn1/asn_mime.c
 libcrypto_la_SOURCES += asn1/asn_moid.c
 libcrypto_la_SOURCES += asn1/asn_pack.c
 libcrypto_la_SOURCES += asn1/bio_asn1.c
 libcrypto_la_SOURCES += asn1/bio_ndef.c
 libcrypto_la_SOURCES += asn1/evp_asn1.c
-libcrypto_la_SOURCES += asn1/f_enum.c
-libcrypto_la_SOURCES += asn1/f_int.c
-libcrypto_la_SOURCES += asn1/f_string.c
 libcrypto_la_SOURCES += asn1/n_pkey.c
 libcrypto_la_SOURCES += asn1/nsseq.c
 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_bitst.c
 libcrypto_la_SOURCES += asn1/t_crl.c
 libcrypto_la_SOURCES += asn1/t_pkey.c
 libcrypto_la_SOURCES += asn1/t_req.c