oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

asn1: Allow asn1_print to build w/o templating

Browse Source
This commit is contained in:
Nicolas Williams
2021-03-10 15:17:00 -06:00
parent c69a9764bc
commit 440bfeda58
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/asn1/Makefile.am
View File

@@ -66,6 +66,9 @@ check_PROGRAMS = $(TESTS)
asn1_gen_SOURCES = asn1_gen.c asn1_gen_SOURCES = asn1_gen.c
asn1_print_SOURCES = asn1_print.c asn1_print_SOURCES = asn1_print.c
if ASN1_TEMPLATING
asn1_print_CPPFLAGS = -DASN1_IOS_SUPPORTED
endif
check_der_SOURCES = check-der.c check-common.c check-common.h check_der_SOURCES = check-der.c check-common.c check-common.h
check_template_SOURCES = check-template.c check-common.c check-common.h check_template_SOURCES = check-template.c check-common.c check-common.h

17
lib/asn1/asn1_print.c
View File

@@ -85,6 +85,7 @@ const struct types {
} types[] = { } types[] = {
#define ASN1_SYM_INTVAL(n, gn, gns, i) #define ASN1_SYM_INTVAL(n, gn, gns, i)
#define ASN1_SYM_OID(n, gn, gns) #define ASN1_SYM_OID(n, gn, gns)
#ifdef ASN1_IOS_SUPPORTED
#define ASN1_SYM_TYPE(n, gn, gns) \ #define ASN1_SYM_TYPE(n, gn, gns) \
{ \ { \
n, \ n, \
@@ -96,6 +97,19 @@ const struct types {
(printer)print_ ## gns, \ (printer)print_ ## gns, \
(releaser)free_ ## gns, \ (releaser)free_ ## gns, \
}, },
#else
#define ASN1_SYM_TYPE(n, gn, gns) \
{ \
n, \
sizeof(gns), \
(copyer)copy_ ## gns, \
(lengther)length_ ## gns, \
(decoder)decode_ ## gns, \
(encoder)encode_ ## gns, \
0, \
(releaser)free_ ## gns, \
},
#endif
#include "cms_asn1_syms.x" #include "cms_asn1_syms.x"
#include "digest_asn1_syms.x" #include "digest_asn1_syms.x"
#include "krb5_asn1_syms.x" #include "krb5_asn1_syms.x"
@@ -421,6 +435,9 @@ dotype(unsigned char *buf, size_t len, char **argv, size_t *size)
if (print_flag) { if (print_flag) {
char *s = NULL; char *s = NULL;
if (!sorted_types[i].print)
err(1, "Missing print support; try enabling / not "
"disabling ASN.1 templating in build configuration");
s = sorted_types[i].print(v, indent_flag ? ASN1_PRINT_INDENT : 0); s = sorted_types[i].print(v, indent_flag ? ASN1_PRINT_INDENT : 0);
if (!s) { if (!s) {
ret = errno; ret = errno;