diff options
Diffstat (limited to 'src/lib')
22 files changed, 66 insertions, 66 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c index 3071baf9ac..028c709d28 100644 --- a/src/lib/libcrypto/x509v3/v3_akey.c +++ b/src/lib/libcrypto/x509v3/v3_akey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_akey.c,v 1.17 2015/09/30 18:41:06 jsing Exp $ */ | 1 | /* $OpenBSD: v3_akey.c,v 1.18 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -73,7 +73,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | |||
73 | const X509V3_EXT_METHOD v3_akey_id = { | 73 | const X509V3_EXT_METHOD v3_akey_id = { |
74 | .ext_nid = NID_authority_key_identifier, | 74 | .ext_nid = NID_authority_key_identifier, |
75 | .ext_flags = X509V3_EXT_MULTILINE, | 75 | .ext_flags = X509V3_EXT_MULTILINE, |
76 | .it = ASN1_ITEM_ref(AUTHORITY_KEYID), | 76 | .it = &AUTHORITY_KEYID_it, |
77 | .ext_new = NULL, | 77 | .ext_new = NULL, |
78 | .ext_free = NULL, | 78 | .ext_free = NULL, |
79 | .d2i = NULL, | 79 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c index 75c68d3cdb..23867ea449 100644 --- a/src/lib/libcrypto/x509v3/v3_alt.c +++ b/src/lib/libcrypto/x509v3/v3_alt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_alt.c,v 1.25 2015/09/30 18:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: v3_alt.c,v 1.26 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -76,7 +76,7 @@ const X509V3_EXT_METHOD v3_alt[] = { | |||
76 | { | 76 | { |
77 | .ext_nid = NID_subject_alt_name, | 77 | .ext_nid = NID_subject_alt_name, |
78 | .ext_flags = 0, | 78 | .ext_flags = 0, |
79 | .it = ASN1_ITEM_ref(GENERAL_NAMES), | 79 | .it = &GENERAL_NAMES_it, |
80 | .ext_new = NULL, | 80 | .ext_new = NULL, |
81 | .ext_free = NULL, | 81 | .ext_free = NULL, |
82 | .d2i = NULL, | 82 | .d2i = NULL, |
@@ -92,7 +92,7 @@ const X509V3_EXT_METHOD v3_alt[] = { | |||
92 | { | 92 | { |
93 | .ext_nid = NID_issuer_alt_name, | 93 | .ext_nid = NID_issuer_alt_name, |
94 | .ext_flags = 0, | 94 | .ext_flags = 0, |
95 | .it = ASN1_ITEM_ref(GENERAL_NAMES), | 95 | .it = &GENERAL_NAMES_it, |
96 | .ext_new = NULL, | 96 | .ext_new = NULL, |
97 | .ext_free = NULL, | 97 | .ext_free = NULL, |
98 | .d2i = NULL, | 98 | .d2i = NULL, |
@@ -108,7 +108,7 @@ const X509V3_EXT_METHOD v3_alt[] = { | |||
108 | { | 108 | { |
109 | .ext_nid = NID_certificate_issuer, | 109 | .ext_nid = NID_certificate_issuer, |
110 | .ext_flags = 0, | 110 | .ext_flags = 0, |
111 | .it = ASN1_ITEM_ref(GENERAL_NAMES), | 111 | .it = &GENERAL_NAMES_it, |
112 | .ext_new = NULL, | 112 | .ext_new = NULL, |
113 | .ext_free = NULL, | 113 | .ext_free = NULL, |
114 | .d2i = NULL, | 114 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_bcons.c b/src/lib/libcrypto/x509v3/v3_bcons.c index 292705a8d6..96b42e2e20 100644 --- a/src/lib/libcrypto/x509v3/v3_bcons.c +++ b/src/lib/libcrypto/x509v3/v3_bcons.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_bcons.c,v 1.13 2015/07/29 16:13:48 jsing Exp $ */ | 1 | /* $OpenBSD: v3_bcons.c,v 1.14 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -73,7 +73,7 @@ static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, | |||
73 | const X509V3_EXT_METHOD v3_bcons = { | 73 | const X509V3_EXT_METHOD v3_bcons = { |
74 | .ext_nid = NID_basic_constraints, | 74 | .ext_nid = NID_basic_constraints, |
75 | .ext_flags = 0, | 75 | .ext_flags = 0, |
76 | .it = ASN1_ITEM_ref(BASIC_CONSTRAINTS), | 76 | .it = &BASIC_CONSTRAINTS_it, |
77 | .ext_new = NULL, | 77 | .ext_new = NULL, |
78 | .ext_free = NULL, | 78 | .ext_free = NULL, |
79 | .d2i = NULL, | 79 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_bitst.c b/src/lib/libcrypto/x509v3/v3_bitst.c index 0670aa306e..e846fc2ffe 100644 --- a/src/lib/libcrypto/x509v3/v3_bitst.c +++ b/src/lib/libcrypto/x509v3/v3_bitst.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_bitst.c,v 1.12 2015/09/29 13:54:40 jsing Exp $ */ | 1 | /* $OpenBSD: v3_bitst.c,v 1.13 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -91,7 +91,7 @@ static BIT_STRING_BITNAME key_usage_type_table[] = { | |||
91 | const X509V3_EXT_METHOD v3_nscert = { | 91 | const X509V3_EXT_METHOD v3_nscert = { |
92 | .ext_nid = NID_netscape_cert_type, | 92 | .ext_nid = NID_netscape_cert_type, |
93 | .ext_flags = 0, | 93 | .ext_flags = 0, |
94 | .it = ASN1_ITEM_ref(ASN1_BIT_STRING), | 94 | .it = &ASN1_BIT_STRING_it, |
95 | .ext_new = NULL, | 95 | .ext_new = NULL, |
96 | .ext_free = NULL, | 96 | .ext_free = NULL, |
97 | .d2i = NULL, | 97 | .d2i = NULL, |
@@ -108,7 +108,7 @@ const X509V3_EXT_METHOD v3_nscert = { | |||
108 | const X509V3_EXT_METHOD v3_key_usage = { | 108 | const X509V3_EXT_METHOD v3_key_usage = { |
109 | .ext_nid = NID_key_usage, | 109 | .ext_nid = NID_key_usage, |
110 | .ext_flags = 0, | 110 | .ext_flags = 0, |
111 | .it = ASN1_ITEM_ref(ASN1_BIT_STRING), | 111 | .it = &ASN1_BIT_STRING_it, |
112 | .ext_new = NULL, | 112 | .ext_new = NULL, |
113 | .ext_free = NULL, | 113 | .ext_free = NULL, |
114 | .d2i = NULL, | 114 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_conf.c b/src/lib/libcrypto/x509v3/v3_conf.c index 20e156ce87..6847985913 100644 --- a/src/lib/libcrypto/x509v3/v3_conf.c +++ b/src/lib/libcrypto/x509v3/v3_conf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_conf.c,v 1.19 2015/12/14 03:39:14 beck Exp $ */ | 1 | /* $OpenBSD: v3_conf.c,v 1.20 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -173,7 +173,7 @@ do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid, int crit, char *value) | |||
173 | 173 | ||
174 | ext = do_ext_i2d(method, ext_nid, crit, ext_struc); | 174 | ext = do_ext_i2d(method, ext_nid, crit, ext_struc); |
175 | if (method->it) | 175 | if (method->it) |
176 | ASN1_item_free(ext_struc, ASN1_ITEM_ptr(method->it)); | 176 | ASN1_item_free(ext_struc, method->it); |
177 | else | 177 | else |
178 | method->ext_free(ext_struc); | 178 | method->ext_free(ext_struc); |
179 | return ext; | 179 | return ext; |
@@ -192,7 +192,7 @@ do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid, int crit, | |||
192 | if (method->it) { | 192 | if (method->it) { |
193 | ext_der = NULL; | 193 | ext_der = NULL; |
194 | ext_len = ASN1_item_i2d(ext_struc, &ext_der, | 194 | ext_len = ASN1_item_i2d(ext_struc, &ext_der, |
195 | ASN1_ITEM_ptr(method->it)); | 195 | method->it); |
196 | if (ext_len < 0) | 196 | if (ext_len < 0) |
197 | goto merr; | 197 | goto merr; |
198 | } else { | 198 | } else { |
diff --git a/src/lib/libcrypto/x509v3/v3_cpols.c b/src/lib/libcrypto/x509v3/v3_cpols.c index 5ca001ad55..216e91c040 100644 --- a/src/lib/libcrypto/x509v3/v3_cpols.c +++ b/src/lib/libcrypto/x509v3/v3_cpols.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_cpols.c,v 1.23 2015/09/30 18:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: v3_cpols.c,v 1.24 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -85,7 +85,7 @@ static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos); | |||
85 | const X509V3_EXT_METHOD v3_cpols = { | 85 | const X509V3_EXT_METHOD v3_cpols = { |
86 | .ext_nid = NID_certificate_policies, | 86 | .ext_nid = NID_certificate_policies, |
87 | .ext_flags = 0, | 87 | .ext_flags = 0, |
88 | .it = ASN1_ITEM_ref(CERTIFICATEPOLICIES), | 88 | .it = &CERTIFICATEPOLICIES_it, |
89 | .ext_new = NULL, | 89 | .ext_new = NULL, |
90 | .ext_free = NULL, | 90 | .ext_free = NULL, |
91 | .d2i = NULL, | 91 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_crld.c b/src/lib/libcrypto/x509v3/v3_crld.c index a72d0ab500..b13bbc3501 100644 --- a/src/lib/libcrypto/x509v3/v3_crld.c +++ b/src/lib/libcrypto/x509v3/v3_crld.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_crld.c,v 1.19 2015/07/29 16:13:48 jsing Exp $ */ | 1 | /* $OpenBSD: v3_crld.c,v 1.20 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -73,7 +73,7 @@ static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out, | |||
73 | const X509V3_EXT_METHOD v3_crld = { | 73 | const X509V3_EXT_METHOD v3_crld = { |
74 | .ext_nid = NID_crl_distribution_points, | 74 | .ext_nid = NID_crl_distribution_points, |
75 | .ext_flags = 0, | 75 | .ext_flags = 0, |
76 | .it = ASN1_ITEM_ref(CRL_DIST_POINTS), | 76 | .it = &CRL_DIST_POINTS_it, |
77 | .ext_new = NULL, | 77 | .ext_new = NULL, |
78 | .ext_free = NULL, | 78 | .ext_free = NULL, |
79 | .d2i = NULL, | 79 | .d2i = NULL, |
@@ -90,7 +90,7 @@ const X509V3_EXT_METHOD v3_crld = { | |||
90 | const X509V3_EXT_METHOD v3_freshest_crl = { | 90 | const X509V3_EXT_METHOD v3_freshest_crl = { |
91 | .ext_nid = NID_freshest_crl, | 91 | .ext_nid = NID_freshest_crl, |
92 | .ext_flags = 0, | 92 | .ext_flags = 0, |
93 | .it = ASN1_ITEM_ref(CRL_DIST_POINTS), | 93 | .it = &CRL_DIST_POINTS_it, |
94 | .ext_new = NULL, | 94 | .ext_new = NULL, |
95 | .ext_free = NULL, | 95 | .ext_free = NULL, |
96 | .d2i = NULL, | 96 | .d2i = NULL, |
@@ -642,7 +642,7 @@ static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
642 | 642 | ||
643 | const X509V3_EXT_METHOD v3_idp = { | 643 | const X509V3_EXT_METHOD v3_idp = { |
644 | NID_issuing_distribution_point, X509V3_EXT_MULTILINE, | 644 | NID_issuing_distribution_point, X509V3_EXT_MULTILINE, |
645 | ASN1_ITEM_ref(ISSUING_DIST_POINT), | 645 | &ISSUING_DIST_POINT_it, |
646 | 0, 0, 0, 0, | 646 | 0, 0, 0, 0, |
647 | 0, 0, | 647 | 0, 0, |
648 | 0, | 648 | 0, |
diff --git a/src/lib/libcrypto/x509v3/v3_enum.c b/src/lib/libcrypto/x509v3/v3_enum.c index 7f35a57012..af6cebcee9 100644 --- a/src/lib/libcrypto/x509v3/v3_enum.c +++ b/src/lib/libcrypto/x509v3/v3_enum.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_enum.c,v 1.11 2015/07/29 16:13:48 jsing Exp $ */ | 1 | /* $OpenBSD: v3_enum.c,v 1.12 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -78,7 +78,7 @@ static ENUMERATED_NAMES crl_reasons[] = { | |||
78 | const X509V3_EXT_METHOD v3_crl_reason = { | 78 | const X509V3_EXT_METHOD v3_crl_reason = { |
79 | .ext_nid = NID_crl_reason, | 79 | .ext_nid = NID_crl_reason, |
80 | .ext_flags = 0, | 80 | .ext_flags = 0, |
81 | .it = ASN1_ITEM_ref(ASN1_ENUMERATED), | 81 | .it = &ASN1_ENUMERATED_it, |
82 | .ext_new = NULL, | 82 | .ext_new = NULL, |
83 | .ext_free = NULL, | 83 | .ext_free = NULL, |
84 | .d2i = NULL, | 84 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_extku.c b/src/lib/libcrypto/x509v3/v3_extku.c index d502175593..88682f6818 100644 --- a/src/lib/libcrypto/x509v3/v3_extku.c +++ b/src/lib/libcrypto/x509v3/v3_extku.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_extku.c,v 1.13 2015/07/29 16:13:48 jsing Exp $ */ | 1 | /* $OpenBSD: v3_extku.c,v 1.14 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -71,7 +71,7 @@ static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE( | |||
71 | const X509V3_EXT_METHOD v3_ext_ku = { | 71 | const X509V3_EXT_METHOD v3_ext_ku = { |
72 | .ext_nid = NID_ext_key_usage, | 72 | .ext_nid = NID_ext_key_usage, |
73 | .ext_flags = 0, | 73 | .ext_flags = 0, |
74 | .it = ASN1_ITEM_ref(EXTENDED_KEY_USAGE), | 74 | .it = &EXTENDED_KEY_USAGE_it, |
75 | .ext_new = NULL, | 75 | .ext_new = NULL, |
76 | .ext_free = NULL, | 76 | .ext_free = NULL, |
77 | .d2i = NULL, | 77 | .d2i = NULL, |
@@ -89,7 +89,7 @@ const X509V3_EXT_METHOD v3_ext_ku = { | |||
89 | const X509V3_EXT_METHOD v3_ocsp_accresp = { | 89 | const X509V3_EXT_METHOD v3_ocsp_accresp = { |
90 | .ext_nid = NID_id_pkix_OCSP_acceptableResponses, | 90 | .ext_nid = NID_id_pkix_OCSP_acceptableResponses, |
91 | .ext_flags = 0, | 91 | .ext_flags = 0, |
92 | .it = ASN1_ITEM_ref(EXTENDED_KEY_USAGE), | 92 | .it = &EXTENDED_KEY_USAGE_it, |
93 | .ext_new = NULL, | 93 | .ext_new = NULL, |
94 | .ext_free = NULL, | 94 | .ext_free = NULL, |
95 | .d2i = NULL, | 95 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c index 20e44ec2b1..74b6439346 100644 --- a/src/lib/libcrypto/x509v3/v3_ia5.c +++ b/src/lib/libcrypto/x509v3/v3_ia5.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_ia5.c,v 1.15 2015/09/30 18:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: v3_ia5.c,v 1.16 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -72,7 +72,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = { | |||
72 | { | 72 | { |
73 | .ext_nid = NID_netscape_base_url, | 73 | .ext_nid = NID_netscape_base_url, |
74 | .ext_flags = 0, | 74 | .ext_flags = 0, |
75 | .it = ASN1_ITEM_ref(ASN1_IA5STRING), | 75 | .it = &ASN1_IA5STRING_it, |
76 | .ext_new = NULL, | 76 | .ext_new = NULL, |
77 | .ext_free = NULL, | 77 | .ext_free = NULL, |
78 | .d2i = NULL, | 78 | .d2i = NULL, |
@@ -88,7 +88,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = { | |||
88 | { | 88 | { |
89 | .ext_nid = NID_netscape_revocation_url, | 89 | .ext_nid = NID_netscape_revocation_url, |
90 | .ext_flags = 0, | 90 | .ext_flags = 0, |
91 | .it = ASN1_ITEM_ref(ASN1_IA5STRING), | 91 | .it = &ASN1_IA5STRING_it, |
92 | .ext_new = NULL, | 92 | .ext_new = NULL, |
93 | .ext_free = NULL, | 93 | .ext_free = NULL, |
94 | .d2i = NULL, | 94 | .d2i = NULL, |
@@ -104,7 +104,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = { | |||
104 | { | 104 | { |
105 | .ext_nid = NID_netscape_ca_revocation_url, | 105 | .ext_nid = NID_netscape_ca_revocation_url, |
106 | .ext_flags = 0, | 106 | .ext_flags = 0, |
107 | .it = ASN1_ITEM_ref(ASN1_IA5STRING), | 107 | .it = &ASN1_IA5STRING_it, |
108 | .ext_new = NULL, | 108 | .ext_new = NULL, |
109 | .ext_free = NULL, | 109 | .ext_free = NULL, |
110 | .d2i = NULL, | 110 | .d2i = NULL, |
@@ -120,7 +120,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = { | |||
120 | { | 120 | { |
121 | .ext_nid = NID_netscape_renewal_url, | 121 | .ext_nid = NID_netscape_renewal_url, |
122 | .ext_flags = 0, | 122 | .ext_flags = 0, |
123 | .it = ASN1_ITEM_ref(ASN1_IA5STRING), | 123 | .it = &ASN1_IA5STRING_it, |
124 | .ext_new = NULL, | 124 | .ext_new = NULL, |
125 | .ext_free = NULL, | 125 | .ext_free = NULL, |
126 | .d2i = NULL, | 126 | .d2i = NULL, |
@@ -136,7 +136,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = { | |||
136 | { | 136 | { |
137 | .ext_nid = NID_netscape_ca_policy_url, | 137 | .ext_nid = NID_netscape_ca_policy_url, |
138 | .ext_flags = 0, | 138 | .ext_flags = 0, |
139 | .it = ASN1_ITEM_ref(ASN1_IA5STRING), | 139 | .it = &ASN1_IA5STRING_it, |
140 | .ext_new = NULL, | 140 | .ext_new = NULL, |
141 | .ext_free = NULL, | 141 | .ext_free = NULL, |
142 | .d2i = NULL, | 142 | .d2i = NULL, |
@@ -152,7 +152,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = { | |||
152 | { | 152 | { |
153 | .ext_nid = NID_netscape_ssl_server_name, | 153 | .ext_nid = NID_netscape_ssl_server_name, |
154 | .ext_flags = 0, | 154 | .ext_flags = 0, |
155 | .it = ASN1_ITEM_ref(ASN1_IA5STRING), | 155 | .it = &ASN1_IA5STRING_it, |
156 | .ext_new = NULL, | 156 | .ext_new = NULL, |
157 | .ext_free = NULL, | 157 | .ext_free = NULL, |
158 | .d2i = NULL, | 158 | .d2i = NULL, |
@@ -168,7 +168,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = { | |||
168 | { | 168 | { |
169 | .ext_nid = NID_netscape_comment, | 169 | .ext_nid = NID_netscape_comment, |
170 | .ext_flags = 0, | 170 | .ext_flags = 0, |
171 | .it = ASN1_ITEM_ref(ASN1_IA5STRING), | 171 | .it = &ASN1_IA5STRING_it, |
172 | .ext_new = NULL, | 172 | .ext_new = NULL, |
173 | .ext_free = NULL, | 173 | .ext_free = NULL, |
174 | .d2i = NULL, | 174 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_info.c b/src/lib/libcrypto/x509v3/v3_info.c index 3b96222187..34ffb1c539 100644 --- a/src/lib/libcrypto/x509v3/v3_info.c +++ b/src/lib/libcrypto/x509v3/v3_info.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_info.c,v 1.23 2015/07/29 16:13:48 jsing Exp $ */ | 1 | /* $OpenBSD: v3_info.c,v 1.24 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -74,7 +74,7 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS( | |||
74 | const X509V3_EXT_METHOD v3_info = { | 74 | const X509V3_EXT_METHOD v3_info = { |
75 | .ext_nid = NID_info_access, | 75 | .ext_nid = NID_info_access, |
76 | .ext_flags = X509V3_EXT_MULTILINE, | 76 | .ext_flags = X509V3_EXT_MULTILINE, |
77 | .it = ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS), | 77 | .it = &AUTHORITY_INFO_ACCESS_it, |
78 | .ext_new = NULL, | 78 | .ext_new = NULL, |
79 | .ext_free = NULL, | 79 | .ext_free = NULL, |
80 | .d2i = NULL, | 80 | .d2i = NULL, |
@@ -91,7 +91,7 @@ const X509V3_EXT_METHOD v3_info = { | |||
91 | const X509V3_EXT_METHOD v3_sinfo = { | 91 | const X509V3_EXT_METHOD v3_sinfo = { |
92 | .ext_nid = NID_sinfo_access, | 92 | .ext_nid = NID_sinfo_access, |
93 | .ext_flags = X509V3_EXT_MULTILINE, | 93 | .ext_flags = X509V3_EXT_MULTILINE, |
94 | .it = ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS), | 94 | .it = &AUTHORITY_INFO_ACCESS_it, |
95 | .ext_new = NULL, | 95 | .ext_new = NULL, |
96 | .ext_free = NULL, | 96 | .ext_free = NULL, |
97 | .d2i = NULL, | 97 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_int.c b/src/lib/libcrypto/x509v3/v3_int.c index bd059b7269..f8a5e7df92 100644 --- a/src/lib/libcrypto/x509v3/v3_int.c +++ b/src/lib/libcrypto/x509v3/v3_int.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_int.c,v 1.10 2015/07/29 16:13:48 jsing Exp $ */ | 1 | /* $OpenBSD: v3_int.c,v 1.11 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -63,7 +63,7 @@ | |||
63 | const X509V3_EXT_METHOD v3_crl_num = { | 63 | const X509V3_EXT_METHOD v3_crl_num = { |
64 | .ext_nid = NID_crl_number, | 64 | .ext_nid = NID_crl_number, |
65 | .ext_flags = 0, | 65 | .ext_flags = 0, |
66 | .it = ASN1_ITEM_ref(ASN1_INTEGER), | 66 | .it = &ASN1_INTEGER_it, |
67 | .ext_new = NULL, | 67 | .ext_new = NULL, |
68 | .ext_free = NULL, | 68 | .ext_free = NULL, |
69 | .d2i = NULL, | 69 | .d2i = NULL, |
@@ -80,7 +80,7 @@ const X509V3_EXT_METHOD v3_crl_num = { | |||
80 | const X509V3_EXT_METHOD v3_delta_crl = { | 80 | const X509V3_EXT_METHOD v3_delta_crl = { |
81 | .ext_nid = NID_delta_crl, | 81 | .ext_nid = NID_delta_crl, |
82 | .ext_flags = 0, | 82 | .ext_flags = 0, |
83 | .it = ASN1_ITEM_ref(ASN1_INTEGER), | 83 | .it = &ASN1_INTEGER_it, |
84 | .ext_new = NULL, | 84 | .ext_new = NULL, |
85 | .ext_free = NULL, | 85 | .ext_free = NULL, |
86 | .d2i = NULL, | 86 | .d2i = NULL, |
@@ -101,7 +101,7 @@ s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx, char *value) | |||
101 | } | 101 | } |
102 | 102 | ||
103 | const X509V3_EXT_METHOD v3_inhibit_anyp = { | 103 | const X509V3_EXT_METHOD v3_inhibit_anyp = { |
104 | NID_inhibit_any_policy, 0, ASN1_ITEM_ref(ASN1_INTEGER), | 104 | NID_inhibit_any_policy, 0, &ASN1_INTEGER_it, |
105 | 0, 0, 0, 0, | 105 | 0, 0, 0, 0, |
106 | (X509V3_EXT_I2S)i2s_ASN1_INTEGER, | 106 | (X509V3_EXT_I2S)i2s_ASN1_INTEGER, |
107 | (X509V3_EXT_S2I)s2i_asn1_int, | 107 | (X509V3_EXT_S2I)s2i_asn1_int, |
diff --git a/src/lib/libcrypto/x509v3/v3_lib.c b/src/lib/libcrypto/x509v3/v3_lib.c index 7731c7c544..2e92747d43 100644 --- a/src/lib/libcrypto/x509v3/v3_lib.c +++ b/src/lib/libcrypto/x509v3/v3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_lib.c,v 1.14 2015/02/10 11:22:22 jsing Exp $ */ | 1 | /* $OpenBSD: v3_lib.c,v 1.15 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -194,7 +194,7 @@ X509V3_EXT_d2i(X509_EXTENSION *ext) | |||
194 | p = ext->value->data; | 194 | p = ext->value->data; |
195 | if (method->it) | 195 | if (method->it) |
196 | return ASN1_item_d2i(NULL, &p, ext->value->length, | 196 | return ASN1_item_d2i(NULL, &p, ext->value->length, |
197 | ASN1_ITEM_ptr(method->it)); | 197 | method->it); |
198 | return method->d2i(NULL, &p, ext->value->length); | 198 | return method->d2i(NULL, &p, ext->value->length); |
199 | } | 199 | } |
200 | 200 | ||
diff --git a/src/lib/libcrypto/x509v3/v3_ncons.c b/src/lib/libcrypto/x509v3/v3_ncons.c index 2af15726a8..e96d426de6 100644 --- a/src/lib/libcrypto/x509v3/v3_ncons.c +++ b/src/lib/libcrypto/x509v3/v3_ncons.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_ncons.c,v 1.9 2015/07/29 16:13:48 jsing Exp $ */ | 1 | /* $OpenBSD: v3_ncons.c,v 1.10 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -82,7 +82,7 @@ static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base); | |||
82 | const X509V3_EXT_METHOD v3_name_constraints = { | 82 | const X509V3_EXT_METHOD v3_name_constraints = { |
83 | .ext_nid = NID_name_constraints, | 83 | .ext_nid = NID_name_constraints, |
84 | .ext_flags = 0, | 84 | .ext_flags = 0, |
85 | .it = ASN1_ITEM_ref(NAME_CONSTRAINTS), | 85 | .it = &NAME_CONSTRAINTS_it, |
86 | .ext_new = NULL, | 86 | .ext_new = NULL, |
87 | .ext_free = NULL, | 87 | .ext_free = NULL, |
88 | .d2i = NULL, | 88 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_ocsp.c b/src/lib/libcrypto/x509v3/v3_ocsp.c index 696eee5adc..0c8094dcb8 100644 --- a/src/lib/libcrypto/x509v3/v3_ocsp.c +++ b/src/lib/libcrypto/x509v3/v3_ocsp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_ocsp.c,v 1.13 2015/09/30 18:41:06 jsing Exp $ */ | 1 | /* $OpenBSD: v3_ocsp.c,v 1.14 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -96,7 +96,7 @@ static int i2r_ocsp_serviceloc(const X509V3_EXT_METHOD *method, void *in, | |||
96 | const X509V3_EXT_METHOD v3_ocsp_crlid = { | 96 | const X509V3_EXT_METHOD v3_ocsp_crlid = { |
97 | .ext_nid = NID_id_pkix_OCSP_CrlID, | 97 | .ext_nid = NID_id_pkix_OCSP_CrlID, |
98 | .ext_flags = 0, | 98 | .ext_flags = 0, |
99 | .it = ASN1_ITEM_ref(OCSP_CRLID), | 99 | .it = &OCSP_CRLID_it, |
100 | .ext_new = NULL, | 100 | .ext_new = NULL, |
101 | .ext_free = NULL, | 101 | .ext_free = NULL, |
102 | .d2i = NULL, | 102 | .d2i = NULL, |
@@ -113,7 +113,7 @@ const X509V3_EXT_METHOD v3_ocsp_crlid = { | |||
113 | const X509V3_EXT_METHOD v3_ocsp_acutoff = { | 113 | const X509V3_EXT_METHOD v3_ocsp_acutoff = { |
114 | .ext_nid = NID_id_pkix_OCSP_archiveCutoff, | 114 | .ext_nid = NID_id_pkix_OCSP_archiveCutoff, |
115 | .ext_flags = 0, | 115 | .ext_flags = 0, |
116 | .it = ASN1_ITEM_ref(ASN1_GENERALIZEDTIME), | 116 | .it = &ASN1_GENERALIZEDTIME_it, |
117 | .ext_new = NULL, | 117 | .ext_new = NULL, |
118 | .ext_free = NULL, | 118 | .ext_free = NULL, |
119 | .d2i = NULL, | 119 | .d2i = NULL, |
@@ -130,7 +130,7 @@ const X509V3_EXT_METHOD v3_ocsp_acutoff = { | |||
130 | const X509V3_EXT_METHOD v3_crl_invdate = { | 130 | const X509V3_EXT_METHOD v3_crl_invdate = { |
131 | .ext_nid = NID_invalidity_date, | 131 | .ext_nid = NID_invalidity_date, |
132 | .ext_flags = 0, | 132 | .ext_flags = 0, |
133 | .it = ASN1_ITEM_ref(ASN1_GENERALIZEDTIME), | 133 | .it = &ASN1_GENERALIZEDTIME_it, |
134 | .ext_new = NULL, | 134 | .ext_new = NULL, |
135 | .ext_free = NULL, | 135 | .ext_free = NULL, |
136 | .d2i = NULL, | 136 | .d2i = NULL, |
@@ -147,7 +147,7 @@ const X509V3_EXT_METHOD v3_crl_invdate = { | |||
147 | const X509V3_EXT_METHOD v3_crl_hold = { | 147 | const X509V3_EXT_METHOD v3_crl_hold = { |
148 | .ext_nid = NID_hold_instruction_code, | 148 | .ext_nid = NID_hold_instruction_code, |
149 | .ext_flags = 0, | 149 | .ext_flags = 0, |
150 | .it = ASN1_ITEM_ref(ASN1_OBJECT), | 150 | .it = &ASN1_OBJECT_it, |
151 | .ext_new = NULL, | 151 | .ext_new = NULL, |
152 | .ext_free = NULL, | 152 | .ext_free = NULL, |
153 | .d2i = NULL, | 153 | .d2i = NULL, |
@@ -181,7 +181,7 @@ const X509V3_EXT_METHOD v3_ocsp_nonce = { | |||
181 | const X509V3_EXT_METHOD v3_ocsp_nocheck = { | 181 | const X509V3_EXT_METHOD v3_ocsp_nocheck = { |
182 | .ext_nid = NID_id_pkix_OCSP_noCheck, | 182 | .ext_nid = NID_id_pkix_OCSP_noCheck, |
183 | .ext_flags = 0, | 183 | .ext_flags = 0, |
184 | .it = ASN1_ITEM_ref(ASN1_NULL), | 184 | .it = &ASN1_NULL_it, |
185 | .ext_new = NULL, | 185 | .ext_new = NULL, |
186 | .ext_free = NULL, | 186 | .ext_free = NULL, |
187 | .d2i = NULL, | 187 | .d2i = NULL, |
@@ -198,7 +198,7 @@ const X509V3_EXT_METHOD v3_ocsp_nocheck = { | |||
198 | const X509V3_EXT_METHOD v3_ocsp_serviceloc = { | 198 | const X509V3_EXT_METHOD v3_ocsp_serviceloc = { |
199 | .ext_nid = NID_id_pkix_OCSP_serviceLocator, | 199 | .ext_nid = NID_id_pkix_OCSP_serviceLocator, |
200 | .ext_flags = 0, | 200 | .ext_flags = 0, |
201 | .it = ASN1_ITEM_ref(OCSP_SERVICELOC), | 201 | .it = &OCSP_SERVICELOC_it, |
202 | .ext_new = NULL, | 202 | .ext_new = NULL, |
203 | .ext_free = NULL, | 203 | .ext_free = NULL, |
204 | .d2i = NULL, | 204 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_pci.c b/src/lib/libcrypto/x509v3/v3_pci.c index ff1d087667..d0a1af96ea 100644 --- a/src/lib/libcrypto/x509v3/v3_pci.c +++ b/src/lib/libcrypto/x509v3/v3_pci.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_pci.c,v 1.10 2015/07/29 16:13:49 jsing Exp $ */ | 1 | /* $OpenBSD: v3_pci.c,v 1.11 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Contributed to the OpenSSL Project 2004 | 2 | /* Contributed to the OpenSSL Project 2004 |
3 | * by Richard Levitte (richard@levitte.org) | 3 | * by Richard Levitte (richard@levitte.org) |
4 | */ | 4 | */ |
@@ -49,7 +49,7 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method, | |||
49 | const X509V3_EXT_METHOD v3_pci = { | 49 | const X509V3_EXT_METHOD v3_pci = { |
50 | .ext_nid = NID_proxyCertInfo, | 50 | .ext_nid = NID_proxyCertInfo, |
51 | .ext_flags = 0, | 51 | .ext_flags = 0, |
52 | .it = ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION), | 52 | .it = &PROXY_CERT_INFO_EXTENSION_it, |
53 | .ext_new = NULL, | 53 | .ext_new = NULL, |
54 | .ext_free = NULL, | 54 | .ext_free = NULL, |
55 | .d2i = NULL, | 55 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_pcons.c b/src/lib/libcrypto/x509v3/v3_pcons.c index a5a8d8a025..144ba88e8d 100644 --- a/src/lib/libcrypto/x509v3/v3_pcons.c +++ b/src/lib/libcrypto/x509v3/v3_pcons.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_pcons.c,v 1.9 2015/07/29 16:13:49 jsing Exp $ */ | 1 | /* $OpenBSD: v3_pcons.c,v 1.10 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -74,7 +74,7 @@ static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method, | |||
74 | const X509V3_EXT_METHOD v3_policy_constraints = { | 74 | const X509V3_EXT_METHOD v3_policy_constraints = { |
75 | .ext_nid = NID_policy_constraints, | 75 | .ext_nid = NID_policy_constraints, |
76 | .ext_flags = 0, | 76 | .ext_flags = 0, |
77 | .it = ASN1_ITEM_ref(POLICY_CONSTRAINTS), | 77 | .it = &POLICY_CONSTRAINTS_it, |
78 | .ext_new = NULL, | 78 | .ext_new = NULL, |
79 | .ext_free = NULL, | 79 | .ext_free = NULL, |
80 | .d2i = NULL, | 80 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_pku.c b/src/lib/libcrypto/x509v3/v3_pku.c index caa3608859..507b0cbd94 100644 --- a/src/lib/libcrypto/x509v3/v3_pku.c +++ b/src/lib/libcrypto/x509v3/v3_pku.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_pku.c,v 1.12 2015/07/29 16:13:49 jsing Exp $ */ | 1 | /* $OpenBSD: v3_pku.c,v 1.13 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -70,7 +70,7 @@ static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, X509V | |||
70 | const X509V3_EXT_METHOD v3_pkey_usage_period = { | 70 | const X509V3_EXT_METHOD v3_pkey_usage_period = { |
71 | .ext_nid = NID_private_key_usage_period, | 71 | .ext_nid = NID_private_key_usage_period, |
72 | .ext_flags = 0, | 72 | .ext_flags = 0, |
73 | .it = ASN1_ITEM_ref(PKEY_USAGE_PERIOD), | 73 | .it = &PKEY_USAGE_PERIOD_it, |
74 | .ext_new = NULL, | 74 | .ext_new = NULL, |
75 | .ext_free = NULL, | 75 | .ext_free = NULL, |
76 | .d2i = NULL, | 76 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_pmaps.c b/src/lib/libcrypto/x509v3/v3_pmaps.c index f2d9090157..8c92098006 100644 --- a/src/lib/libcrypto/x509v3/v3_pmaps.c +++ b/src/lib/libcrypto/x509v3/v3_pmaps.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_pmaps.c,v 1.9 2015/07/29 16:13:49 jsing Exp $ */ | 1 | /* $OpenBSD: v3_pmaps.c,v 1.10 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -72,7 +72,7 @@ static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS( | |||
72 | const X509V3_EXT_METHOD v3_policy_mappings = { | 72 | const X509V3_EXT_METHOD v3_policy_mappings = { |
73 | .ext_nid = NID_policy_mappings, | 73 | .ext_nid = NID_policy_mappings, |
74 | .ext_flags = 0, | 74 | .ext_flags = 0, |
75 | .it = ASN1_ITEM_ref(POLICY_MAPPINGS), | 75 | .it = &POLICY_MAPPINGS_it, |
76 | .ext_new = NULL, | 76 | .ext_new = NULL, |
77 | .ext_free = NULL, | 77 | .ext_free = NULL, |
78 | .d2i = NULL, | 78 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_prn.c b/src/lib/libcrypto/x509v3/v3_prn.c index e2d8dd8c87..f65c7aaa8a 100644 --- a/src/lib/libcrypto/x509v3/v3_prn.c +++ b/src/lib/libcrypto/x509v3/v3_prn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_prn.c,v 1.18 2015/07/29 14:58:34 jsing Exp $ */ | 1 | /* $OpenBSD: v3_prn.c,v 1.19 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -115,7 +115,7 @@ X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent) | |||
115 | p = ext->value->data; | 115 | p = ext->value->data; |
116 | if (method->it) | 116 | if (method->it) |
117 | ext_str = ASN1_item_d2i(NULL, &p, ext->value->length, | 117 | ext_str = ASN1_item_d2i(NULL, &p, ext->value->length, |
118 | ASN1_ITEM_ptr(method->it)); | 118 | method->it); |
119 | else | 119 | else |
120 | ext_str = method->d2i(NULL, &p, ext->value->length); | 120 | ext_str = method->d2i(NULL, &p, ext->value->length); |
121 | 121 | ||
@@ -145,7 +145,7 @@ err: | |||
145 | sk_CONF_VALUE_pop_free(nval, X509V3_conf_free); | 145 | sk_CONF_VALUE_pop_free(nval, X509V3_conf_free); |
146 | free(value); | 146 | free(value); |
147 | if (method->it) | 147 | if (method->it) |
148 | ASN1_item_free(ext_str, ASN1_ITEM_ptr(method->it)); | 148 | ASN1_item_free(ext_str, method->it); |
149 | else | 149 | else |
150 | method->ext_free(ext_str); | 150 | method->ext_free(ext_str); |
151 | return ok; | 151 | return ok; |
diff --git a/src/lib/libcrypto/x509v3/v3_skey.c b/src/lib/libcrypto/x509v3/v3_skey.c index f742b67b33..fbd66bb721 100644 --- a/src/lib/libcrypto/x509v3/v3_skey.c +++ b/src/lib/libcrypto/x509v3/v3_skey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_skey.c,v 1.13 2015/09/30 18:41:06 jsing Exp $ */ | 1 | /* $OpenBSD: v3_skey.c,v 1.14 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -68,7 +68,7 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, | |||
68 | const X509V3_EXT_METHOD v3_skey_id = { | 68 | const X509V3_EXT_METHOD v3_skey_id = { |
69 | .ext_nid = NID_subject_key_identifier, | 69 | .ext_nid = NID_subject_key_identifier, |
70 | .ext_flags = 0, | 70 | .ext_flags = 0, |
71 | .it = ASN1_ITEM_ref(ASN1_OCTET_STRING), | 71 | .it = &ASN1_OCTET_STRING_it, |
72 | .ext_new = NULL, | 72 | .ext_new = NULL, |
73 | .ext_free = NULL, | 73 | .ext_free = NULL, |
74 | .d2i = NULL, | 74 | .d2i = NULL, |
diff --git a/src/lib/libcrypto/x509v3/v3_sxnet.c b/src/lib/libcrypto/x509v3/v3_sxnet.c index 29976b1d68..bb88da4b49 100644 --- a/src/lib/libcrypto/x509v3/v3_sxnet.c +++ b/src/lib/libcrypto/x509v3/v3_sxnet.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_sxnet.c,v 1.17 2015/09/30 17:30:16 jsing Exp $ */ | 1 | /* $OpenBSD: v3_sxnet.c,v 1.18 2016/12/30 15:54:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -79,7 +79,7 @@ static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
79 | const X509V3_EXT_METHOD v3_sxnet = { | 79 | const X509V3_EXT_METHOD v3_sxnet = { |
80 | .ext_nid = NID_sxnet, | 80 | .ext_nid = NID_sxnet, |
81 | .ext_flags = X509V3_EXT_MULTILINE, | 81 | .ext_flags = X509V3_EXT_MULTILINE, |
82 | .it = ASN1_ITEM_ref(SXNET), | 82 | .it = &SXNET_it, |
83 | .ext_new = NULL, | 83 | .ext_new = NULL, |
84 | .ext_free = NULL, | 84 | .ext_free = NULL, |
85 | .d2i = NULL, | 85 | .d2i = NULL, |