diff options
| -rw-r--r-- | lib/libssl/src/crypto/asn1/tasn_typ.c | 42 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/asn1/x_algor.c | 22 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/asn1/x_exten.c | 22 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/asn1/x_name.c | 42 |
4 files changed, 106 insertions, 22 deletions
diff --git a/lib/libssl/src/crypto/asn1/tasn_typ.c b/lib/libssl/src/crypto/asn1/tasn_typ.c index 5e838e2cf07..542713aa097 100644 --- a/lib/libssl/src/crypto/asn1/tasn_typ.c +++ b/lib/libssl/src/crypto/asn1/tasn_typ.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tasn_typ.c,v 1.12 2015/07/24 13:49:58 jsing Exp $ */ +/* $OpenBSD: tasn_typ.c,v 1.13 2015/07/24 15:09:52 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -735,13 +735,41 @@ const ASN1_ITEM ASN1_OCTET_STRING_NDEF_it = { .sname = "ASN1_OCTET_STRING_NDEF", }; -ASN1_ITEM_TEMPLATE(ASN1_SEQUENCE_ANY) = - ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, ASN1_SEQUENCE_ANY, ASN1_ANY) -ASN1_ITEM_TEMPLATE_END(ASN1_SEQUENCE_ANY) +static const ASN1_TEMPLATE ASN1_SEQUENCE_ANY_item_tt = { + .flags = ASN1_TFLG_SEQUENCE_OF, + .tag = 0, + .offset = 0, + .field_name = "ASN1_SEQUENCE_ANY", + .item = &ASN1_ANY_it, +}; + +const ASN1_ITEM ASN1_SEQUENCE_ANY_it = { + .itype = ASN1_ITYPE_PRIMITIVE, + .utype = -1, + .templates = &ASN1_SEQUENCE_ANY_item_tt, + .tcount = 0, + .funcs = NULL, + .size = 0, + .sname = "ASN1_SEQUENCE_ANY", +}; -ASN1_ITEM_TEMPLATE(ASN1_SET_ANY) = - ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, ASN1_SET_ANY, ASN1_ANY) -ASN1_ITEM_TEMPLATE_END(ASN1_SET_ANY) +static const ASN1_TEMPLATE ASN1_SET_ANY_item_tt = { + .flags = ASN1_TFLG_SET_OF, + .tag = 0, + .offset = 0, + .field_name = "ASN1_SET_ANY", + .item = &ASN1_ANY_it, +}; + +const ASN1_ITEM ASN1_SET_ANY_it = { + .itype = ASN1_ITYPE_PRIMITIVE, + .utype = -1, + .templates = &ASN1_SET_ANY_item_tt, + .tcount = 0, + .funcs = NULL, + .size = 0, + .sname = "ASN1_SET_ANY", +}; ASN1_SEQUENCE_ANY * diff --git a/lib/libssl/src/crypto/asn1/x_algor.c b/lib/libssl/src/crypto/asn1/x_algor.c index 9fc1f7ff087..27405a2bfb9 100644 --- a/lib/libssl/src/crypto/asn1/x_algor.c +++ b/lib/libssl/src/crypto/asn1/x_algor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_algor.c,v 1.20 2015/02/11 04:00:39 jsing Exp $ */ +/* $OpenBSD: x_algor.c,v 1.21 2015/07/24 15:09:52 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -84,9 +84,23 @@ const ASN1_ITEM X509_ALGOR_it = { .sname = "X509_ALGOR", }; -ASN1_ITEM_TEMPLATE(X509_ALGORS) = - ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, algorithms, X509_ALGOR) -ASN1_ITEM_TEMPLATE_END(X509_ALGORS) +static const ASN1_TEMPLATE X509_ALGORS_item_tt = { + .flags = ASN1_TFLG_SEQUENCE_OF, + .tag = 0, + .offset = 0, + .field_name = "algorithms", + .item = &X509_ALGOR_it, +}; + +const ASN1_ITEM X509_ALGORS_it = { + .itype = ASN1_ITYPE_PRIMITIVE, + .utype = -1, + .templates = &X509_ALGORS_item_tt, + .tcount = 0, + .funcs = NULL, + .size = 0, + .sname = "X509_ALGORS", +}; X509_ALGOR * diff --git a/lib/libssl/src/crypto/asn1/x_exten.c b/lib/libssl/src/crypto/asn1/x_exten.c index b4b8cfe42a5..bb3dffc8218 100644 --- a/lib/libssl/src/crypto/asn1/x_exten.c +++ b/lib/libssl/src/crypto/asn1/x_exten.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_exten.c,v 1.15 2015/02/11 04:00:39 jsing Exp $ */ +/* $OpenBSD: x_exten.c,v 1.16 2015/07/24 15:09:52 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -89,9 +89,23 @@ const ASN1_ITEM X509_EXTENSION_it = { .sname = "X509_EXTENSION", }; -ASN1_ITEM_TEMPLATE(X509_EXTENSIONS) = - ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Extension, X509_EXTENSION) -ASN1_ITEM_TEMPLATE_END(X509_EXTENSIONS) +static const ASN1_TEMPLATE X509_EXTENSIONS_item_tt = { + .flags = ASN1_TFLG_SEQUENCE_OF, + .tag = 0, + .offset = 0, + .field_name = "Extension", + .item = &X509_EXTENSION_it, +}; + +const ASN1_ITEM X509_EXTENSIONS_it = { + .itype = ASN1_ITYPE_PRIMITIVE, + .utype = -1, + .templates = &X509_EXTENSIONS_item_tt, + .tcount = 0, + .funcs = NULL, + .size = 0, + .sname = "X509_EXTENSIONS", +}; X509_EXTENSION * diff --git a/lib/libssl/src/crypto/asn1/x_name.c b/lib/libssl/src/crypto/asn1/x_name.c index 569c6fe3460..be936318d86 100644 --- a/lib/libssl/src/crypto/asn1/x_name.c +++ b/lib/libssl/src/crypto/asn1/x_name.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_name.c,v 1.30 2015/07/15 17:41:56 miod Exp $ */ +/* $OpenBSD: x_name.c,v 1.31 2015/07/24 15:09:52 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -145,13 +145,41 @@ X509_NAME_ENTRY_dup(X509_NAME_ENTRY *x) * so declare two template wrappers for this */ -ASN1_ITEM_TEMPLATE(X509_NAME_ENTRIES) = - ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, RDNS, X509_NAME_ENTRY) -ASN1_ITEM_TEMPLATE_END(X509_NAME_ENTRIES) +static const ASN1_TEMPLATE X509_NAME_ENTRIES_item_tt = { + .flags = ASN1_TFLG_SET_OF, + .tag = 0, + .offset = 0, + .field_name = "RDNS", + .item = &X509_NAME_ENTRY_it, +}; + +const ASN1_ITEM X509_NAME_ENTRIES_it = { + .itype = ASN1_ITYPE_PRIMITIVE, + .utype = -1, + .templates = &X509_NAME_ENTRIES_item_tt, + .tcount = 0, + .funcs = NULL, + .size = 0, + .sname = "X509_NAME_ENTRIES", +}; -ASN1_ITEM_TEMPLATE(X509_NAME_INTERNAL) = - ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Name, X509_NAME_ENTRIES) -ASN1_ITEM_TEMPLATE_END(X509_NAME_INTERNAL) +static const ASN1_TEMPLATE X509_NAME_INTERNAL_item_tt = { + .flags = ASN1_TFLG_SEQUENCE_OF, + .tag = 0, + .offset = 0, + .field_name = "Name", + .item = &X509_NAME_ENTRIES_it, +}; + +const ASN1_ITEM X509_NAME_INTERNAL_it = { + .itype = ASN1_ITYPE_PRIMITIVE, + .utype = -1, + .templates = &X509_NAME_INTERNAL_item_tt, + .tcount = 0, + .funcs = NULL, + .size = 0, + .sname = "X509_NAME_INTERNAL", +}; /* Normally that's where it would end: we'd have two nested STACK structures * representing the ASN1. Unfortunately X509_NAME uses a completely different |