Move ASN.1 definitions for ROAs and Manifests to common header files

used by all the C programs.

svn path=/branches/tk274/; revision=4725

5 files changed, 143 insertions, 218 deletions

diff --git a/rcynic/Makefile.in b/rcynic/Makefile.in
index eba83f39..1e9b9b5e 100644
--- a/rcynic/Makefile.in
+++ b/rcynic/Makefile.in
@@ -6,7 +6,6 @@ BIN = ${NAME}
 SRC = ${NAME}.c
 OBJ = ${NAME}.o
 
-HDR = defasn1.h
 GEN = defstack.h
 
 OBJS = ${OBJ} bio_f_linebreak.o
@@ -32,13 +31,14 @@ clean:
 	cd static-rsync; ${MAKE} $@
 	rm -f ${BIN} ${OBJS} ${GEN} ${SCRIPTS}
 
-${OBJ}: ${SRC} ${HDR} ${GEN}
+${OBJ}: ${SRC} ${GEN}
 
 ${BIN}: ${OBJS}
 	${CC} ${CFLAGS} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}
 
-defstack.h: defstack.awk ${SRC} ${HDR}
-	${AWK} -f >$@ defstack.awk ${SRC} ${HDR}
+${GEN}: ${SRC}
+	${PYTHON} ${abs_top_srcdir}/buildtools/defstack.py ${SRC} >$@.tmp
+	mv $@.tmp $@
 
 test: ${BIN}
 	if test -r rcynic.conf; \
@@ -75,5 +75,5 @@ rcynic-html: rcynic-html.py
 
 tags: TAGS
 
-TAGS: ${SRC} ${HDR} ${GEN}
-	etags ${SRC} ${HDR} ${GEN}
+TAGS: ${SRC} ${GEN}
+	etags ${SRC} ${GEN}
diff --git a/rcynic/defasn1.h b/rcynic/defasn1.h
deleted file mode 100644
index c14e0ce5..00000000
--- a/rcynic/defasn1.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2009--2011  Internet Systems Consortium ("ISC")
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * Portions copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id$ */
-
-#ifndef __DEFASN1_H__
-#define __DEFASN1_H__
-
-#include <openssl/bio.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-#include <openssl/safestack.h>
-#include <openssl/conf.h>
-#include <openssl/rand.h>
-#include <openssl/asn1t.h>
-#include <openssl/cms.h>
-
-/*
- * ASN.1 templates.  Not sure that ASN1_EXP_OPT() is the right macro
- * for these defaulted "version" fields, but it's what the examples
- * for this construction use.  Probably doesn't matter since this
- * program only decodes manifests, never encodes them.
- *
- * Putting this section under conditional compilation is a hack to
- * keep Doxygen's parser from becoming hopelessly confused by the
- * weird OpenSSL ASN.1 macros.  Someday perhaps I'll have time to
- * track down the problem in Doxygen's parser, but this works for now.
- */
-
-#ifndef DOXYGEN_GETS_HOPELESSLY_CONFUSED_BY_THIS_SECTION
-
-typedef struct FileAndHash_st {
-  ASN1_IA5STRING *file;
-  ASN1_BIT_STRING *hash;
-} FileAndHash;
-
-DECLARE_STACK_OF(FileAndHash)
-
-ASN1_SEQUENCE(FileAndHash) = {
-  ASN1_SIMPLE(FileAndHash, file, ASN1_IA5STRING),
-  ASN1_SIMPLE(FileAndHash, hash, ASN1_BIT_STRING)
-} ASN1_SEQUENCE_END(FileAndHash)
-
-typedef struct Manifest_st {
-  ASN1_INTEGER *version, *manifestNumber;
-  ASN1_GENERALIZEDTIME *thisUpdate, *nextUpdate;
-  ASN1_OBJECT *fileHashAlg;
-  STACK_OF(FileAndHash) *fileList;
-} Manifest;
-
-ASN1_SEQUENCE(Manifest) = {
-  ASN1_EXP_OPT(Manifest, version, ASN1_INTEGER, 0),
-  ASN1_SIMPLE(Manifest, manifestNumber, ASN1_INTEGER),
-  ASN1_SIMPLE(Manifest, thisUpdate, ASN1_GENERALIZEDTIME),
-  ASN1_SIMPLE(Manifest, nextUpdate, ASN1_GENERALIZEDTIME),
-  ASN1_SIMPLE(Manifest, fileHashAlg, ASN1_OBJECT),
-  ASN1_SEQUENCE_OF(Manifest, fileList, FileAndHash)
-} ASN1_SEQUENCE_END(Manifest)
-
-DECLARE_ASN1_FUNCTIONS(FileAndHash)
-DECLARE_ASN1_FUNCTIONS(Manifest)
-
-IMPLEMENT_ASN1_FUNCTIONS(FileAndHash)
-IMPLEMENT_ASN1_FUNCTIONS(Manifest)
-
-typedef struct ROAIPAddress_st {
-  ASN1_BIT_STRING *IPAddress;
-  ASN1_INTEGER *maxLength;
-} ROAIPAddress;
-
-DECLARE_STACK_OF(ROAIPAddress)
-
-ASN1_SEQUENCE(ROAIPAddress) = {
-  ASN1_SIMPLE(ROAIPAddress, IPAddress, ASN1_BIT_STRING),
-  ASN1_OPT(ROAIPAddress, maxLength, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(ROAIPAddress)
-
-typedef struct ROAIPAddressFamily_st {
-  ASN1_OCTET_STRING *addressFamily;
-  STACK_OF(ROAIPAddress) *addresses;
-} ROAIPAddressFamily;
-
-DECLARE_STACK_OF(ROAIPAddressFamily)
-
-ASN1_SEQUENCE(ROAIPAddressFamily) = {
-  ASN1_SIMPLE(ROAIPAddressFamily, addressFamily, ASN1_OCTET_STRING),
-  ASN1_SEQUENCE_OF(ROAIPAddressFamily, addresses, ROAIPAddress)
-} ASN1_SEQUENCE_END(ROAIPAddressFamily)
-
-typedef struct ROA_st {
-  ASN1_INTEGER *version, *asID;
-  STACK_OF(ROAIPAddressFamily) *ipAddrBlocks;
-} ROA;
-
-ASN1_SEQUENCE(ROA) = {
-  ASN1_EXP_OPT(ROA, version, ASN1_INTEGER, 0),
-  ASN1_SIMPLE(ROA, asID, ASN1_INTEGER),
-  ASN1_SEQUENCE_OF(ROA, ipAddrBlocks, ROAIPAddressFamily)
-} ASN1_SEQUENCE_END(ROA)
-
-DECLARE_ASN1_FUNCTIONS(ROAIPAddress)
-DECLARE_ASN1_FUNCTIONS(ROAIPAddressFamily)
-DECLARE_ASN1_FUNCTIONS(ROA)
-
-IMPLEMENT_ASN1_FUNCTIONS(ROAIPAddress)
-IMPLEMENT_ASN1_FUNCTIONS(ROAIPAddressFamily)
-IMPLEMENT_ASN1_FUNCTIONS(ROA)
-
-#endif /* DOXYGEN_GETS_HOPELESSLY_CONFUSED_BY_THIS_SECTION */
-
-#endif /* __DEFASN1_H__ */
diff --git a/rcynic/defstack.awk b/rcynic/defstack.awk
deleted file mode 100644
index 4593cb33..00000000
--- a/rcynic/defstack.awk
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id$
-#
-# Copyright (C) 2011  Internet Systems Consortium ("ISC")
-# 
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-function print_line(name, line)
-{
-  gsub(/%/, name, line);
-  print line;
-}
-
-function define_stack(name)
-{
-  print_line(name, "/*");
-  print_line(name, " * Safestack macros for %.");
-  print_line(name, " */");
-  print_line(name, "#define sk_%_new(st)                     SKM_sk_new(%, (st))");
-  print_line(name, "#define sk_%_new_null()                  SKM_sk_new_null(%)");
-  print_line(name, "#define sk_%_free(st)                    SKM_sk_free(%, (st))");
-  print_line(name, "#define sk_%_num(st)                     SKM_sk_num(%, (st))");
-  print_line(name, "#define sk_%_value(st, i)                SKM_sk_value(%, (st), (i))");
-  print_line(name, "#define sk_%_set(st, i, val)             SKM_sk_set(%, (st), (i), (val))");
-  print_line(name, "#define sk_%_zero(st)                    SKM_sk_zero(%, (st))");
-  print_line(name, "#define sk_%_push(st, val)               SKM_sk_push(%, (st), (val))");
-  print_line(name, "#define sk_%_unshift(st, val)            SKM_sk_unshift(%, (st), (val))");
-  print_line(name, "#define sk_%_find(st, val)               SKM_sk_find(%, (st), (val))");
-  print_line(name, "#define sk_%_find_ex(st, val)            SKM_sk_find_ex(%, (st), (val))");
-  print_line(name, "#define sk_%_delete(st, i)               SKM_sk_delete(%, (st), (i))");
-  print_line(name, "#define sk_%_delete_ptr(st, ptr)         SKM_sk_delete_ptr(%, (st), (ptr))");
-  print_line(name, "#define sk_%_insert(st, val, i)          SKM_sk_insert(%, (st), (val), (i))");
-  print_line(name, "#define sk_%_set_cmp_func(st, cmp)       SKM_sk_set_cmp_func(%, (st), (cmp))");
-  print_line(name, "#define sk_%_dup(st)                     SKM_sk_dup(%, st)");
-  print_line(name, "#define sk_%_pop_free(st, free_func)     SKM_sk_pop_free(%, (st), (free_func))");
-  print_line(name, "#define sk_%_shift(st)                   SKM_sk_shift(%, (st))");
-  print_line(name, "#define sk_%_pop(st)                     SKM_sk_pop(%, (st))");
-  print_line(name, "#define sk_%_sort(st)                    SKM_sk_sort(%, (st))");
-  print_line(name, "#define sk_%_is_sorted(st)               SKM_sk_is_sorted(%, (st))");
-  print_line(name, "");
-} 
-
-BEGIN {
-  print "/*";
-  print " * Automatically generated, do not edit.";
-  print " * Generator $Id$";
-  print " */";
-  print "";
-  print "#ifndef __DEFSTACK_H__";
-  print "#define __DEFSTACK_H__";
-  print "";
-}
-
-/DECLARE_STACK_OF/ {
-  sub(/^[ \t]+/, "");
-  if (split($0, a, /[() \t]+/) > 1 && a[1] == "DECLARE_STACK_OF")
-    define_stack(a[2]);
-}
-
-END {
-  print "#endif /* __DEFSTACK_H__ */";
-}
diff --git a/rcynic/defstack.h b/rcynic/defstack.h
new file mode 100644
index 00000000..2ad23498
--- /dev/null
+++ b/rcynic/defstack.h
@@ -0,0 +1,134 @@
+/*
+ * Automatically generated, do not edit.
+ * Generator $Id: defstack.awk 3985 2011-09-15 00:04:23Z sra $
+ */
+
+#ifndef __RCYNIC_C__DEFSTACK_H__
+#define __RCYNIC_C__DEFSTACK_H__
+
+/*
+ * Safestack macros for validation_status_t.
+ */
+#define sk_validation_status_t_new(st)                     SKM_sk_new(validation_status_t, (st))
+#define sk_validation_status_t_new_null()                  SKM_sk_new_null(validation_status_t)
+#define sk_validation_status_t_free(st)                    SKM_sk_free(validation_status_t, (st))
+#define sk_validation_status_t_num(st)                     SKM_sk_num(validation_status_t, (st))
+#define sk_validation_status_t_value(st, i)                SKM_sk_value(validation_status_t, (st), (i))
+#define sk_validation_status_t_set(st, i, val)             SKM_sk_set(validation_status_t, (st), (i), (val))
+#define sk_validation_status_t_zero(st)                    SKM_sk_zero(validation_status_t, (st))
+#define sk_validation_status_t_push(st, val)               SKM_sk_push(validation_status_t, (st), (val))
+#define sk_validation_status_t_unshift(st, val)            SKM_sk_unshift(validation_status_t, (st), (val))
+#define sk_validation_status_t_find(st, val)               SKM_sk_find(validation_status_t, (st), (val))
+#define sk_validation_status_t_find_ex(st, val)            SKM_sk_find_ex(validation_status_t, (st), (val))
+#define sk_validation_status_t_delete(st, i)               SKM_sk_delete(validation_status_t, (st), (i))
+#define sk_validation_status_t_delete_ptr(st, ptr)         SKM_sk_delete_ptr(validation_status_t, (st), (ptr))
+#define sk_validation_status_t_insert(st, val, i)          SKM_sk_insert(validation_status_t, (st), (val), (i))
+#define sk_validation_status_t_set_cmp_func(st, cmp)       SKM_sk_set_cmp_func(validation_status_t, (st), (cmp))
+#define sk_validation_status_t_dup(st)                     SKM_sk_dup(validation_status_t, st)
+#define sk_validation_status_t_pop_free(st, free_func)     SKM_sk_pop_free(validation_status_t, (st), (free_func))
+#define sk_validation_status_t_shift(st)                   SKM_sk_shift(validation_status_t, (st))
+#define sk_validation_status_t_pop(st)                     SKM_sk_pop(validation_status_t, (st))
+#define sk_validation_status_t_sort(st)                    SKM_sk_sort(validation_status_t, (st))
+#define sk_validation_status_t_is_sorted(st)               SKM_sk_is_sorted(validation_status_t, (st))
+
+/*
+ * Safestack macros for walk_ctx_t.
+ */
+#define sk_walk_ctx_t_new(st)                     SKM_sk_new(walk_ctx_t, (st))
+#define sk_walk_ctx_t_new_null()                  SKM_sk_new_null(walk_ctx_t)
+#define sk_walk_ctx_t_free(st)                    SKM_sk_free(walk_ctx_t, (st))
+#define sk_walk_ctx_t_num(st)                     SKM_sk_num(walk_ctx_t, (st))
+#define sk_walk_ctx_t_value(st, i)                SKM_sk_value(walk_ctx_t, (st), (i))
+#define sk_walk_ctx_t_set(st, i, val)             SKM_sk_set(walk_ctx_t, (st), (i), (val))
+#define sk_walk_ctx_t_zero(st)                    SKM_sk_zero(walk_ctx_t, (st))
+#define sk_walk_ctx_t_push(st, val)               SKM_sk_push(walk_ctx_t, (st), (val))
+#define sk_walk_ctx_t_unshift(st, val)            SKM_sk_unshift(walk_ctx_t, (st), (val))
+#define sk_walk_ctx_t_find(st, val)               SKM_sk_find(walk_ctx_t, (st), (val))
+#define sk_walk_ctx_t_find_ex(st, val)            SKM_sk_find_ex(walk_ctx_t, (st), (val))
+#define sk_walk_ctx_t_delete(st, i)               SKM_sk_delete(walk_ctx_t, (st), (i))
+#define sk_walk_ctx_t_delete_ptr(st, ptr)         SKM_sk_delete_ptr(walk_ctx_t, (st), (ptr))
+#define sk_walk_ctx_t_insert(st, val, i)          SKM_sk_insert(walk_ctx_t, (st), (val), (i))
+#define sk_walk_ctx_t_set_cmp_func(st, cmp)       SKM_sk_set_cmp_func(walk_ctx_t, (st), (cmp))
+#define sk_walk_ctx_t_dup(st)                     SKM_sk_dup(walk_ctx_t, st)
+#define sk_walk_ctx_t_pop_free(st, free_func)     SKM_sk_pop_free(walk_ctx_t, (st), (free_func))
+#define sk_walk_ctx_t_shift(st)                   SKM_sk_shift(walk_ctx_t, (st))
+#define sk_walk_ctx_t_pop(st)                     SKM_sk_pop(walk_ctx_t, (st))
+#define sk_walk_ctx_t_sort(st)                    SKM_sk_sort(walk_ctx_t, (st))
+#define sk_walk_ctx_t_is_sorted(st)               SKM_sk_is_sorted(walk_ctx_t, (st))
+
+/*
+ * Safestack macros for rsync_ctx_t.
+ */
+#define sk_rsync_ctx_t_new(st)                     SKM_sk_new(rsync_ctx_t, (st))
+#define sk_rsync_ctx_t_new_null()                  SKM_sk_new_null(rsync_ctx_t)
+#define sk_rsync_ctx_t_free(st)                    SKM_sk_free(rsync_ctx_t, (st))
+#define sk_rsync_ctx_t_num(st)                     SKM_sk_num(rsync_ctx_t, (st))
+#define sk_rsync_ctx_t_value(st, i)                SKM_sk_value(rsync_ctx_t, (st), (i))
+#define sk_rsync_ctx_t_set(st, i, val)             SKM_sk_set(rsync_ctx_t, (st), (i), (val))
+#define sk_rsync_ctx_t_zero(st)                    SKM_sk_zero(rsync_ctx_t, (st))
+#define sk_rsync_ctx_t_push(st, val)               SKM_sk_push(rsync_ctx_t, (st), (val))
+#define sk_rsync_ctx_t_unshift(st, val)            SKM_sk_unshift(rsync_ctx_t, (st), (val))
+#define sk_rsync_ctx_t_find(st, val)               SKM_sk_find(rsync_ctx_t, (st), (val))
+#define sk_rsync_ctx_t_find_ex(st, val)            SKM_sk_find_ex(rsync_ctx_t, (st), (val))
+#define sk_rsync_ctx_t_delete(st, i)               SKM_sk_delete(rsync_ctx_t, (st), (i))
+#define sk_rsync_ctx_t_delete_ptr(st, ptr)         SKM_sk_delete_ptr(rsync_ctx_t, (st), (ptr))
+#define sk_rsync_ctx_t_insert(st, val, i)          SKM_sk_insert(rsync_ctx_t, (st), (val), (i))
+#define sk_rsync_ctx_t_set_cmp_func(st, cmp)       SKM_sk_set_cmp_func(rsync_ctx_t, (st), (cmp))
+#define sk_rsync_ctx_t_dup(st)                     SKM_sk_dup(rsync_ctx_t, st)
+#define sk_rsync_ctx_t_pop_free(st, free_func)     SKM_sk_pop_free(rsync_ctx_t, (st), (free_func))
+#define sk_rsync_ctx_t_shift(st)                   SKM_sk_shift(rsync_ctx_t, (st))
+#define sk_rsync_ctx_t_pop(st)                     SKM_sk_pop(rsync_ctx_t, (st))
+#define sk_rsync_ctx_t_sort(st)                    SKM_sk_sort(rsync_ctx_t, (st))
+#define sk_rsync_ctx_t_is_sorted(st)               SKM_sk_is_sorted(rsync_ctx_t, (st))
+
+/*
+ * Safestack macros for rsync_history_t.
+ */
+#define sk_rsync_history_t_new(st)                     SKM_sk_new(rsync_history_t, (st))
+#define sk_rsync_history_t_new_null()                  SKM_sk_new_null(rsync_history_t)
+#define sk_rsync_history_t_free(st)                    SKM_sk_free(rsync_history_t, (st))
+#define sk_rsync_history_t_num(st)                     SKM_sk_num(rsync_history_t, (st))
+#define sk_rsync_history_t_value(st, i)                SKM_sk_value(rsync_history_t, (st), (i))
+#define sk_rsync_history_t_set(st, i, val)             SKM_sk_set(rsync_history_t, (st), (i), (val))
+#define sk_rsync_history_t_zero(st)                    SKM_sk_zero(rsync_history_t, (st))
+#define sk_rsync_history_t_push(st, val)               SKM_sk_push(rsync_history_t, (st), (val))
+#define sk_rsync_history_t_unshift(st, val)            SKM_sk_unshift(rsync_history_t, (st), (val))
+#define sk_rsync_history_t_find(st, val)               SKM_sk_find(rsync_history_t, (st), (val))
+#define sk_rsync_history_t_find_ex(st, val)            SKM_sk_find_ex(rsync_history_t, (st), (val))
+#define sk_rsync_history_t_delete(st, i)               SKM_sk_delete(rsync_history_t, (st), (i))
+#define sk_rsync_history_t_delete_ptr(st, ptr)         SKM_sk_delete_ptr(rsync_history_t, (st), (ptr))
+#define sk_rsync_history_t_insert(st, val, i)          SKM_sk_insert(rsync_history_t, (st), (val), (i))
+#define sk_rsync_history_t_set_cmp_func(st, cmp)       SKM_sk_set_cmp_func(rsync_history_t, (st), (cmp))
+#define sk_rsync_history_t_dup(st)                     SKM_sk_dup(rsync_history_t, st)
+#define sk_rsync_history_t_pop_free(st, free_func)     SKM_sk_pop_free(rsync_history_t, (st), (free_func))
+#define sk_rsync_history_t_shift(st)                   SKM_sk_shift(rsync_history_t, (st))
+#define sk_rsync_history_t_pop(st)                     SKM_sk_pop(rsync_history_t, (st))
+#define sk_rsync_history_t_sort(st)                    SKM_sk_sort(rsync_history_t, (st))
+#define sk_rsync_history_t_is_sorted(st)               SKM_sk_is_sorted(rsync_history_t, (st))
+
+/*
+ * Safestack macros for task_t.
+ */
+#define sk_task_t_new(st)                     SKM_sk_new(task_t, (st))
+#define sk_task_t_new_null()                  SKM_sk_new_null(task_t)
+#define sk_task_t_free(st)                    SKM_sk_free(task_t, (st))
+#define sk_task_t_num(st)                     SKM_sk_num(task_t, (st))
+#define sk_task_t_value(st, i)                SKM_sk_value(task_t, (st), (i))
+#define sk_task_t_set(st, i, val)             SKM_sk_set(task_t, (st), (i), (val))
+#define sk_task_t_zero(st)                    SKM_sk_zero(task_t, (st))
+#define sk_task_t_push(st, val)               SKM_sk_push(task_t, (st), (val))
+#define sk_task_t_unshift(st, val)            SKM_sk_unshift(task_t, (st), (val))
+#define sk_task_t_find(st, val)               SKM_sk_find(task_t, (st), (val))
+#define sk_task_t_find_ex(st, val)            SKM_sk_find_ex(task_t, (st), (val))
+#define sk_task_t_delete(st, i)               SKM_sk_delete(task_t, (st), (i))
+#define sk_task_t_delete_ptr(st, ptr)         SKM_sk_delete_ptr(task_t, (st), (ptr))
+#define sk_task_t_insert(st, val, i)          SKM_sk_insert(task_t, (st), (val), (i))
+#define sk_task_t_set_cmp_func(st, cmp)       SKM_sk_set_cmp_func(task_t, (st), (cmp))
+#define sk_task_t_dup(st)                     SKM_sk_dup(task_t, st)
+#define sk_task_t_pop_free(st, free_func)     SKM_sk_pop_free(task_t, (st), (free_func))
+#define sk_task_t_shift(st)                   SKM_sk_shift(task_t, (st))
+#define sk_task_t_pop(st)                     SKM_sk_pop(task_t, (st))
+#define sk_task_t_sort(st)                    SKM_sk_sort(task_t, (st))
+#define sk_task_t_is_sorted(st)               SKM_sk_is_sorted(task_t, (st))
+
+#endif /* __RCYNIC_C__DEFSTACK_H__ */
diff --git a/rcynic/rcynic.c b/rcynic/rcynic.c
index ccf91d6b..5b6630b7 100644
--- a/rcynic/rcynic.c
+++ b/rcynic/rcynic.c
@@ -77,10 +77,12 @@
 #include <openssl/asn1t.h>
 #include <openssl/cms.h>
 
+#include <rpki/roa.h>
+#include <rpki/manifest.h>
+
 #include "bio_f_linebreak.h"
 
 #include "defstack.h"
-#include "defasn1.h"
 
 /*
  * Whether to run the old slow STACK-based validation_status lookup in