diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-07-25 16:14:30 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-07-25 16:14:30 +0000 |
| commit | e0aa55eb7d19a41fcc516dbb2735fed441bf3b00 (patch) | |
| tree | f6dc705f1f04438befc0e34bb0edd0074b252202 /lib | |
| parent | 9b82f65b66593844bacf21750f356166ba29851c (diff) | |
Expand ASN.1 template macros that got missed in the last pass - only change
to generated assembly is due to line numbers.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/x509v3/v3_crld.c | 10 | ||||
| -rw-r--r-- | lib/libcrypto/x509v3/v3_ncons.c | 21 | ||||
| -rw-r--r-- | lib/libcrypto/x509v3/v3_pcons.c | 11 |
3 files changed, 31 insertions, 11 deletions
diff --git a/lib/libcrypto/x509v3/v3_crld.c b/lib/libcrypto/x509v3/v3_crld.c index 9c4017968d7..9055a412890 100644 --- a/lib/libcrypto/x509v3/v3_crld.c +++ b/lib/libcrypto/x509v3/v3_crld.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_crld.c,v 1.17 2015/07/25 16:00:14 jsing Exp $ */ +/* $OpenBSD: v3_crld.c,v 1.18 2015/07/25 16:14:29 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -390,7 +390,13 @@ static const ASN1_TEMPLATE DIST_POINT_NAME_ch_tt[] = { .field_name = "name.fullname", .item = &GENERAL_NAME_it, }, - ASN1_IMP_SET_OF(DIST_POINT_NAME, name.relativename, X509_NAME_ENTRY, 1) + { + .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SET_OF, + .tag = 1, + .offset = offsetof(DIST_POINT_NAME, name.relativename), + .field_name = "name.relativename", + .item = &X509_NAME_ENTRY_it, + }, }; const ASN1_ITEM DIST_POINT_NAME_it = { diff --git a/lib/libcrypto/x509v3/v3_ncons.c b/lib/libcrypto/x509v3/v3_ncons.c index e154b6ba187..22b9cfc683d 100644 --- a/lib/libcrypto/x509v3/v3_ncons.c +++ b/lib/libcrypto/x509v3/v3_ncons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_ncons.c,v 1.7 2015/07/25 16:00:14 jsing Exp $ */ +/* $OpenBSD: v3_ncons.c,v 1.8 2015/07/25 16:14:29 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -124,10 +124,20 @@ const ASN1_ITEM GENERAL_SUBTREE_it = { }; static const ASN1_TEMPLATE NAME_CONSTRAINTS_seq_tt[] = { - ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, permittedSubtrees, - GENERAL_SUBTREE, 0), - ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, excludedSubtrees, - GENERAL_SUBTREE, 1), + { + .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_OPTIONAL, + .tag = 0, + .offset = offsetof(NAME_CONSTRAINTS, permittedSubtrees), + .field_name = "permittedSubtrees", + .item = &GENERAL_SUBTREE_it, + }, + { + .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_OPTIONAL, + .tag = 1, + .offset = offsetof(NAME_CONSTRAINTS, excludedSubtrees), + .field_name = "excludedSubtrees", + .item = &GENERAL_SUBTREE_it, + }, }; const ASN1_ITEM NAME_CONSTRAINTS_it = { @@ -141,7 +151,6 @@ const ASN1_ITEM NAME_CONSTRAINTS_it = { }; - GENERAL_SUBTREE * GENERAL_SUBTREE_new(void) { diff --git a/lib/libcrypto/x509v3/v3_pcons.c b/lib/libcrypto/x509v3/v3_pcons.c index 7bece062711..03193427f72 100644 --- a/lib/libcrypto/x509v3/v3_pcons.c +++ b/lib/libcrypto/x509v3/v3_pcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_pcons.c,v 1.7 2015/07/25 16:00:14 jsing Exp $ */ +/* $OpenBSD: v3_pcons.c,v 1.8 2015/07/25 16:14:29 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -83,8 +83,13 @@ const X509V3_EXT_METHOD v3_policy_constraints = { }; static const ASN1_TEMPLATE POLICY_CONSTRAINTS_seq_tt[] = { - ASN1_IMP_OPT(POLICY_CONSTRAINTS, requireExplicitPolicy, - ASN1_INTEGER, 0), + { + .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL, + .tag = 0, + .offset = offsetof(POLICY_CONSTRAINTS, requireExplicitPolicy), + .field_name = "requireExplicitPolicy", + .item = &ASN1_INTEGER_it, + }, { .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL, .tag = 1, |