1 files changed, 132 insertions, 21 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_crld.c b/src/lib/libcrypto/x509v3/v3_crld.c
index b2e4370658..9c4017968d 100644
--- a/src/lib/libcrypto/x509v3/v3_crld.c
+++ b/src/lib/libcrypto/x509v3/v3_crld.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_crld.c,v 1.16 2015/02/14 15:19:04 miod Exp $ */
+/* $OpenBSD: v3_crld.c,v 1.17 2015/07/25 16:00:14 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -374,10 +374,34 @@ dpn_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 }
 
 
-ASN1_CHOICE_cb(DIST_POINT_NAME, dpn_cb) = {
-        ASN1_IMP_SEQUENCE_OF(DIST_POINT_NAME, name.fullname, GENERAL_NAME, 0),
+static const ASN1_AUX DIST_POINT_NAME_aux = {
+        .app_data = NULL,
+        .flags = 0,
+        .ref_offset = 0,
+        .ref_lock = 0,
+        .asn1_cb = dpn_cb,
+        .enc_offset = 0,
+};
+static const ASN1_TEMPLATE DIST_POINT_NAME_ch_tt[] = {
+        {
+                .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF,
+                .tag = 0,
+                .offset = offsetof(DIST_POINT_NAME, name.fullname),
+                .field_name = "name.fullname",
+                .item = &GENERAL_NAME_it,
+        },
         ASN1_IMP_SET_OF(DIST_POINT_NAME, name.relativename, X509_NAME_ENTRY, 1)
-} ASN1_CHOICE_END_cb(DIST_POINT_NAME, DIST_POINT_NAME, type)
+};
+
+const ASN1_ITEM DIST_POINT_NAME_it = {
+        .itype = ASN1_ITYPE_CHOICE,
+        .utype = offsetof(DIST_POINT_NAME, type),
+        .templates = DIST_POINT_NAME_ch_tt,
+        .tcount = sizeof(DIST_POINT_NAME_ch_tt) / sizeof(ASN1_TEMPLATE),
+        .funcs = &DIST_POINT_NAME_aux,
+        .size = sizeof(DIST_POINT_NAME),
+        .sname = "DIST_POINT_NAME",
+};
 
 
 
@@ -406,11 +430,39 @@ DIST_POINT_NAME_free(DIST_POINT_NAME *a)
         ASN1_item_free((ASN1_VALUE *)a, &DIST_POINT_NAME_it);
 }
 
-ASN1_SEQUENCE(DIST_POINT) = {
-        ASN1_EXP_OPT(DIST_POINT, distpoint, DIST_POINT_NAME, 0),
-        ASN1_IMP_OPT(DIST_POINT, reasons, ASN1_BIT_STRING, 1),
-        ASN1_IMP_SEQUENCE_OF_OPT(DIST_POINT, CRLissuer, GENERAL_NAME, 2)
-} ASN1_SEQUENCE_END(DIST_POINT)
+static const ASN1_TEMPLATE DIST_POINT_seq_tt[] = {
+        {
+                .flags = ASN1_TFLG_EXPLICIT | ASN1_TFLG_OPTIONAL,
+                .tag = 0,
+                .offset = offsetof(DIST_POINT, distpoint),
+                .field_name = "distpoint",
+                .item = &DIST_POINT_NAME_it,
+        },
+        {
+                .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
+                .tag = 1,
+                .offset = offsetof(DIST_POINT, reasons),
+                .field_name = "reasons",
+                .item = &ASN1_BIT_STRING_it,
+        },
+        {
+                .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_OPTIONAL,
+                .tag = 2,
+                .offset = offsetof(DIST_POINT, CRLissuer),
+                .field_name = "CRLissuer",
+                .item = &GENERAL_NAME_it,
+        },
+};
+
+const ASN1_ITEM DIST_POINT_it = {
+        .itype = ASN1_ITYPE_SEQUENCE,
+        .utype = V_ASN1_SEQUENCE,
+        .templates = DIST_POINT_seq_tt,
+        .tcount = sizeof(DIST_POINT_seq_tt) / sizeof(ASN1_TEMPLATE),
+        .funcs = NULL,
+        .size = sizeof(DIST_POINT),
+        .sname = "DIST_POINT",
+};
 
 
 DIST_POINT *
@@ -438,10 +490,23 @@ DIST_POINT_free(DIST_POINT *a)
         ASN1_item_free((ASN1_VALUE *)a, &DIST_POINT_it);
 }
 
-ASN1_ITEM_TEMPLATE(CRL_DIST_POINTS) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CRLDistributionPoints,
-        DIST_POINT)
-ASN1_ITEM_TEMPLATE_END(CRL_DIST_POINTS)
+static const ASN1_TEMPLATE CRL_DIST_POINTS_item_tt = {
+        .flags = ASN1_TFLG_SEQUENCE_OF,
+        .tag = 0,
+        .offset = 0,
+        .field_name = "CRLDistributionPoints",
+        .item = &DIST_POINT_it,
+};
+
+const ASN1_ITEM CRL_DIST_POINTS_it = {
+        .itype = ASN1_ITYPE_PRIMITIVE,
+        .utype = -1,
+        .templates = &CRL_DIST_POINTS_item_tt,
+        .tcount = 0,
+        .funcs = NULL,
+        .size = 0,
+        .sname = "CRL_DIST_POINTS",
+};
 
 
 CRL_DIST_POINTS *
@@ -469,14 +534,60 @@ CRL_DIST_POINTS_free(CRL_DIST_POINTS *a)
         ASN1_item_free((ASN1_VALUE *)a, &CRL_DIST_POINTS_it);
 }
 
-ASN1_SEQUENCE(ISSUING_DIST_POINT) = {
-        ASN1_EXP_OPT(ISSUING_DIST_POINT, distpoint, DIST_POINT_NAME, 0),
-        ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyuser, ASN1_FBOOLEAN, 1),
-        ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyCA, ASN1_FBOOLEAN, 2),
-        ASN1_IMP_OPT(ISSUING_DIST_POINT, onlysomereasons, ASN1_BIT_STRING, 3),
-        ASN1_IMP_OPT(ISSUING_DIST_POINT, indirectCRL, ASN1_FBOOLEAN, 4),
-        ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyattr, ASN1_FBOOLEAN, 5)
-} ASN1_SEQUENCE_END(ISSUING_DIST_POINT)
+static const ASN1_TEMPLATE ISSUING_DIST_POINT_seq_tt[] = {
+        {
+                .flags = ASN1_TFLG_EXPLICIT | ASN1_TFLG_OPTIONAL,
+                .tag = 0,
+                .offset = offsetof(ISSUING_DIST_POINT, distpoint),
+                .field_name = "distpoint",
+                .item = &DIST_POINT_NAME_it,
+        },
+        {
+                .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
+                .tag = 1,
+                .offset = offsetof(ISSUING_DIST_POINT, onlyuser),
+                .field_name = "onlyuser",
+                .item = &ASN1_FBOOLEAN_it,
+        },
+        {
+                .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
+                .tag = 2,
+                .offset = offsetof(ISSUING_DIST_POINT, onlyCA),
+                .field_name = "onlyCA",
+                .item = &ASN1_FBOOLEAN_it,
+        },
+        {
+                .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
+                .tag = 3,
+                .offset = offsetof(ISSUING_DIST_POINT, onlysomereasons),
+                .field_name = "onlysomereasons",
+                .item = &ASN1_BIT_STRING_it,
+        },
+        {
+                .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
+                .tag = 4,
+                .offset = offsetof(ISSUING_DIST_POINT, indirectCRL),
+                .field_name = "indirectCRL",
+                .item = &ASN1_FBOOLEAN_it,
+        },
+        {
+                .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
+                .tag = 5,
+                .offset = offsetof(ISSUING_DIST_POINT, onlyattr),
+                .field_name = "onlyattr",
+                .item = &ASN1_FBOOLEAN_it,
+        },
+};
+
+const ASN1_ITEM ISSUING_DIST_POINT_it = {
+        .itype = ASN1_ITYPE_SEQUENCE,
+        .utype = V_ASN1_SEQUENCE,
+        .templates = ISSUING_DIST_POINT_seq_tt,
+        .tcount = sizeof(ISSUING_DIST_POINT_seq_tt) / sizeof(ASN1_TEMPLATE),
+        .funcs = NULL,
+        .size = sizeof(ISSUING_DIST_POINT),
+        .sname = "ISSUING_DIST_POINT",
+};
 
 
 ISSUING_DIST_POINT *