From a3a03842f68732cc08c0241c40cf99fd11a8a3a4 Mon Sep 17 00:00:00 2001 From: kinichiro Date: Thu, 9 Dec 2021 19:59:29 +0900 Subject: [PATCH] Consolidate d2i_pr.c/i2d_pr.c into a_pkey.c and consolidate d2i_pu.c/i2d_pu.c into a_pubkey.c --- crypto/CMakeLists.txt | 6 ++---- crypto/Makefile.am | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 75db747..670df83 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -255,6 +255,8 @@ set( asn1/a_mbstr.c asn1/a_object.c asn1/a_octet.c + asn1/a_pkey.c + asn1/a_pubkey.c asn1/a_print.c asn1/a_sign.c asn1/a_strex.c @@ -274,14 +276,10 @@ set( asn1/asn_pack.c asn1/bio_asn1.c asn1/bio_ndef.c - asn1/d2i_pr.c - asn1/d2i_pu.c asn1/evp_asn1.c asn1/f_enum.c asn1/f_int.c asn1/f_string.c - asn1/i2d_pr.c - asn1/i2d_pu.c asn1/n_pkey.c asn1/nsseq.c asn1/p5_pbe.c diff --git a/crypto/Makefile.am b/crypto/Makefile.am index ceab628..34bdd43 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -300,6 +300,8 @@ libcrypto_la_SOURCES += asn1/a_int.c 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_sign.c libcrypto_la_SOURCES += asn1/a_strex.c @@ -319,14 +321,10 @@ 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/d2i_pr.c -libcrypto_la_SOURCES += asn1/d2i_pu.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/i2d_pr.c -libcrypto_la_SOURCES += asn1/i2d_pu.c libcrypto_la_SOURCES += asn1/n_pkey.c libcrypto_la_SOURCES += asn1/nsseq.c libcrypto_la_SOURCES += asn1/p5_pbe.c