From c4ff603adfaf190b8e9244b15bb5a4a050bbe58a Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Thu, 11 Mar 2021 11:58:18 -0600 Subject: [PATCH] asn1: Fix asn1_print build w/ templating --- lib/asn1/Makefile.am | 6 ++++-- lib/asn1/asn1_print.c | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am index f913221e9..4fcd271da 100644 --- a/lib/asn1/Makefile.am +++ b/lib/asn1/Makefile.am @@ -53,7 +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 +gen_files_x690sample_template = asn1_x690sample_template_asn1.x oid_resolution.lo: $(BUILT_SOURCES) @@ -193,6 +193,7 @@ CLEANFILES = \ digest_asn1_files digest_asn1*.h* digest_asn1*.x \ kx509_asn1_files kx509_asn1*.h* kx509_asn1*.x \ x690sample_asn1_files x690sample_asn1*.h* x690sample_asn1*.x \ + x690sample_template_asn1_files x690sample_template_asn1*.h* x690sample_template_asn1*.x \ test_asn1_files test_asn1*.h* test_asn1*.x \ test_template_asn1* \ asn1_*.tmp.c asn1_*.x @@ -216,6 +217,7 @@ nodist_include_HEADERS += pkcs12_asn1.h nodist_include_HEADERS += digest_asn1.h nodist_include_HEADERS += kx509_asn1.h nodist_include_HEADERS += x690sample_asn1.h +nodist_include_HEADERS += x690sample_template_asn1.h priv_headers = krb5_asn1-priv.h priv_headers += pkinit_asn1-priv.h @@ -230,7 +232,7 @@ priv_headers += pkcs10_asn1-priv.h priv_headers += pkcs12_asn1-priv.h priv_headers += digest_asn1-priv.h priv_headers += kx509_asn1-priv.h -priv_headers += x690sample_asn1-priv.h +priv_headers += x690sample_template_asn1-priv.h priv_headers += test_template_asn1.h test_template_asn1-priv.h priv_headers += test_asn1.h test_asn1-priv.h diff --git a/lib/asn1/asn1_print.c b/lib/asn1/asn1_print.c index 08c64b7df..b175ac2f9 100644 --- a/lib/asn1/asn1_print.c +++ b/lib/asn1/asn1_print.c @@ -53,7 +53,11 @@ #include "pkinit_asn1.h" #include "rfc2459_asn1.h" #include "rfc4108_asn1.h" +#ifdef ASN1_PRINT_SUPPORTED +#include "x690sample_template_asn1.h" +#else #include "x690sample_asn1.h" +#endif static int quiet_flag = 0; static int print_flag = 1;