From 1b5fe4a35c59ccc8386f7f5f262b429dd26f3f1b Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Wed, 10 Mar 2021 22:52:07 -0600 Subject: [PATCH] asn1: Test x690 sample with both backends And remove it from the library itself. --- lib/asn1/Makefile.am | 18 ++++++++++++------ lib/asn1/asn1_print.c | 3 +-- lib/asn1/libasn1-exports.def | 30 ------------------------------ 3 files changed, 13 insertions(+), 38 deletions(-) diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am index fa2b4f567..92bff2137 100644 --- a/lib/asn1/Makefile.am +++ b/lib/asn1/Makefile.am @@ -35,8 +35,7 @@ BUILT_SOURCES = \ $(gen_files_pkcs10:.x=.c) \ $(gen_files_pkcs12:.x=.c) \ $(gen_files_digest:.x=.c) \ - $(gen_files_kx509:.x=.c) \ - $(gen_files_x690sample:.x=.c) + $(gen_files_kx509:.x=.c) gen_files_krb5 = asn1_krb5_asn1.x gen_files_cms = asn1_cms_asn1.x @@ -54,6 +53,7 @@ gen_files_test = asn1_test_asn1.x gen_files_digest = asn1_digest_asn1.x gen_files_kx509 = asn1_kx509_asn1.x gen_files_x690sample = asn1_x690sample_asn1.x +gen_files_x690sample_template = asn1_x690sample_asn1.x oid_resolution.lo: $(BUILT_SOURCES) @@ -67,7 +67,7 @@ check_PROGRAMS = $(TESTS) asn1_gen_SOURCES = asn1_gen.c asn1_print_SOURCES = asn1_print.c if ASN1_TEMPLATING -asn1_print_CPPFLAGS = -DASN1_IOS_SUPPORTED +asn1_print_CPPFLAGS = -DASN1_PRINT_SUPPORTED endif check_der_SOURCES = check-der.c check-common.c check-common.h @@ -76,10 +76,11 @@ nodist_check_template_SOURCES = $(gen_files_test_template:.x=.c) check_gen_template_CPPFLAGS = -DASN1_IOS_SUPPORTED dist_check_gen_template_SOURCES = check-gen.c check-common.c check-common.h -nodist_check_gen_template_SOURCES = $(gen_files_test_template:.x=.c) +nodist_check_gen_template_SOURCES = $(gen_files_test_template:.x=.c) \ + $(gen_files_x690sample_template:.x=.c) dist_check_gen_SOURCES = check-gen.c check-common.c check-common.h -nodist_check_gen_SOURCES = $(gen_files_test:.x=.c) +nodist_check_gen_SOURCES = $(gen_files_test:.x=.c) $(gen_files_x690sample:.x=.c) build_HEADERZ = asn1-template.h @@ -169,6 +170,7 @@ CLEANFILES = \ $(gen_files_digest) \ $(gen_files_kx509) \ $(gen_files_x690sample) \ + $(gen_files_x690sample_template) \ $(gen_files_test) \ $(gen_files_test_template) \ $(nodist_check_gen_SOURCES) \ @@ -254,6 +256,7 @@ $(gen_files_rfc4108) rfc4108_asn1.hx rfc4108_asn1-priv.hx: rfc4108_asn1_files $(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files $(gen_files_crmf) crmf_asn1.hx crmf_asn1-priv.hx: crmf_asn1_files $(gen_files_x690sample) x690sample_asn1.hx x690sample_asn1-priv.hx: x690sample_asn1_files +$(gen_files_x690sample_template) x690sample_template_asn1.hx x690sample_template_asn1-priv.hx: x690sample_template_asn1_files $(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files $(gen_files_test_template) test_template_asn1.hx test_template_asn1-priv.hx: test_template_asn1_files @@ -302,8 +305,11 @@ digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 $(ASN1_COMPILE) --one-code-file $(TEMPLATE_OPTION) $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1) +x690sample_template_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/x690sample.asn1 + $(ASN1_COMPILE) --one-code-file --template $(srcdir)/x690sample.asn1 x690sample_template_asn1 || (rm -f x690sample_asn1_files ; exit 1) + x690sample_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/x690sample.asn1 - $(ASN1_COMPILE) --one-code-file $(TEMPLATE_OPTION) $(srcdir)/x690sample.asn1 x690sample_asn1 || (rm -f x690sample_asn1_files ; exit 1) + $(ASN1_COMPILE) --one-code-file $(srcdir)/x690sample.asn1 x690sample_asn1 || (rm -f x690sample_asn1_files ; exit 1) test_template_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 $(ASN1_COMPILE) --one-code-file --template --sequence=TESTSeqOf $(srcdir)/test.asn1 test_template_asn1 || (rm -f test_template_asn1_files ; exit 1) diff --git a/lib/asn1/asn1_print.c b/lib/asn1/asn1_print.c index 6e5472a15..27ea87ad9 100644 --- a/lib/asn1/asn1_print.c +++ b/lib/asn1/asn1_print.c @@ -85,7 +85,7 @@ const struct types { } types[] = { #define ASN1_SYM_INTVAL(n, gn, gns, i) #define ASN1_SYM_OID(n, gn, gns) -#ifdef ASN1_IOS_SUPPORTED +#ifdef ASN1_PRINT_SUPPORTED #define ASN1_SYM_TYPE(n, gn, gns) \ { \ n, \ @@ -122,7 +122,6 @@ const struct types { #include "pkinit_asn1_syms.x" #include "rfc2459_asn1_syms.x" #include "rfc4108_asn1_syms.x" -#include "x690sample_asn1_syms.x" }; struct types sorted_types[sizeof(types)/sizeof(types[0])]; diff --git a/lib/asn1/libasn1-exports.def b/lib/asn1/libasn1-exports.def index d4b395a8a..2de8b74d0 100644 --- a/lib/asn1/libasn1-exports.def +++ b/lib/asn1/libasn1-exports.def @@ -634,11 +634,6 @@ EXPORTS copy_X520OrganizationalUnitName copy_X520OrganizationName copy_X520StateOrProvinceName - copy_X690SampleChildInformation - copy_X690SampleDate - copy_X690SampleEmployeeNumber - copy_X690SampleName - copy_X690SamplePersonnelRecord decode_AccessDescription decode_AD_AND_OR decode_AD_IF_RELEVANT @@ -995,11 +990,6 @@ EXPORTS decode_X520OrganizationalUnitName decode_X520OrganizationName decode_X520StateOrProvinceName - decode_X690SampleChildInformation - decode_X690SampleDate - decode_X690SampleEmployeeNumber - decode_X690SampleName - decode_X690SamplePersonnelRecord der_copy_bit_string der_copy_bmp_string der_copy_generalized_time @@ -1502,11 +1492,6 @@ EXPORTS encode_X520OrganizationalUnitName encode_X520OrganizationName encode_X520StateOrProvinceName - encode_X690SampleChildInformation - encode_X690SampleDate - encode_X690SampleEmployeeNumber - encode_X690SampleName - encode_X690SamplePersonnelRecord FastOptions2int free_AccessDescription free_AD_AND_OR @@ -1864,11 +1849,6 @@ EXPORTS free_X520OrganizationalUnitName free_X520OrganizationName free_X520StateOrProvinceName - free_X690SampleChildInformation - free_X690SampleDate - free_X690SampleEmployeeNumber - free_X690SampleName - free_X690SamplePersonnelRecord heim_any_cmp HEIM_ANY_cmp _heim_der_set_sort @@ -2245,11 +2225,6 @@ EXPORTS length_X520OrganizationalUnitName length_X520OrganizationName length_X520StateOrProvinceName - length_X690SampleChildInformation - length_X690SampleDate - length_X690SampleEmployeeNumber - length_X690SampleName - length_X690SamplePersonnelRecord print_AccessDescription print_AD_AND_OR print_AD_IF_RELEVANT @@ -2606,11 +2581,6 @@ EXPORTS print_X520OrganizationalUnitName print_X520OrganizationName print_X520StateOrProvinceName - print_X690SampleChildInformation - print_X690SampleDate - print_X690SampleEmployeeNumber - print_X690SampleName - print_X690SamplePersonnelRecord remove_AttributeValues remove_AuthorizationData remove_CertificatePolicies