From ae84f39407e5f0add92094593cc52922198355d4 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 30 Dec 2016 15:54:49 +0000
Subject: Expand ASN1_ITEM_ref and ASN1_ITEM_ptr macros - no change in
 generated assembly. Of particular interest is ASN1_ITEM_ptr which does
 nothing and resulted in code like:

  if (method->it)
    ASN1_ITEM_free(..., ASN1_ITEM_ptr(method->it));
---
 src/lib/libcrypto/x509v3/v3_akey.c  |  4 ++--
 src/lib/libcrypto/x509v3/v3_alt.c   |  8 ++++----
 src/lib/libcrypto/x509v3/v3_bcons.c |  4 ++--
 src/lib/libcrypto/x509v3/v3_bitst.c |  6 +++---
 src/lib/libcrypto/x509v3/v3_conf.c  |  6 +++---
 src/lib/libcrypto/x509v3/v3_cpols.c |  4 ++--
 src/lib/libcrypto/x509v3/v3_crld.c  |  8 ++++----
 src/lib/libcrypto/x509v3/v3_enum.c  |  4 ++--
 src/lib/libcrypto/x509v3/v3_extku.c |  6 +++---
 src/lib/libcrypto/x509v3/v3_ia5.c   | 16 ++++++++--------
 src/lib/libcrypto/x509v3/v3_info.c  |  6 +++---
 src/lib/libcrypto/x509v3/v3_int.c   |  8 ++++----
 src/lib/libcrypto/x509v3/v3_lib.c   |  4 ++--
 src/lib/libcrypto/x509v3/v3_ncons.c |  4 ++--
 src/lib/libcrypto/x509v3/v3_ocsp.c  | 14 +++++++-------
 src/lib/libcrypto/x509v3/v3_pci.c   |  4 ++--
 src/lib/libcrypto/x509v3/v3_pcons.c |  4 ++--
 src/lib/libcrypto/x509v3/v3_pku.c   |  4 ++--
 src/lib/libcrypto/x509v3/v3_pmaps.c |  4 ++--
 src/lib/libcrypto/x509v3/v3_prn.c   |  6 +++---
 src/lib/libcrypto/x509v3/v3_skey.c  |  4 ++--
 src/lib/libcrypto/x509v3/v3_sxnet.c |  4 ++--
 22 files changed, 66 insertions(+), 66 deletions(-)

(limited to 'src/lib')

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 @@
-/* $OpenBSD: v3_akey.c,v 1.17 2015/09/30 18:41:06 jsing Exp $ */
+/* $OpenBSD: v3_akey.c,v 1.18 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -73,7 +73,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
 const X509V3_EXT_METHOD v3_akey_id = {
 	.ext_nid = NID_authority_key_identifier,
 	.ext_flags = X509V3_EXT_MULTILINE,
-	.it = ASN1_ITEM_ref(AUTHORITY_KEYID),
+	.it = &AUTHORITY_KEYID_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_alt.c,v 1.25 2015/09/30 18:21:50 jsing Exp $ */
+/* $OpenBSD: v3_alt.c,v 1.26 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -76,7 +76,7 @@ const X509V3_EXT_METHOD v3_alt[] = {
 	{
 		.ext_nid = NID_subject_alt_name,
 		.ext_flags = 0,
-		.it = ASN1_ITEM_ref(GENERAL_NAMES),
+		.it = &GENERAL_NAMES_it,
 		.ext_new = NULL,
 		.ext_free = NULL,
 		.d2i = NULL,
@@ -92,7 +92,7 @@ const X509V3_EXT_METHOD v3_alt[] = {
 	{
 		.ext_nid = NID_issuer_alt_name,
 		.ext_flags = 0,
-		.it = ASN1_ITEM_ref(GENERAL_NAMES),
+		.it = &GENERAL_NAMES_it,
 		.ext_new = NULL,
 		.ext_free = NULL,
 		.d2i = NULL,
@@ -108,7 +108,7 @@ const X509V3_EXT_METHOD v3_alt[] = {
 	{
 		.ext_nid = NID_certificate_issuer,
 		.ext_flags = 0,
-		.it = ASN1_ITEM_ref(GENERAL_NAMES),
+		.it = &GENERAL_NAMES_it,
 		.ext_new = NULL,
 		.ext_free = NULL,
 		.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 @@
-/* $OpenBSD: v3_bcons.c,v 1.13 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_bcons.c,v 1.14 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -73,7 +73,7 @@ static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
 const X509V3_EXT_METHOD v3_bcons = {
 	.ext_nid = NID_basic_constraints,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(BASIC_CONSTRAINTS),
+	.it = &BASIC_CONSTRAINTS_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_bitst.c,v 1.12 2015/09/29 13:54:40 jsing Exp $ */
+/* $OpenBSD: v3_bitst.c,v 1.13 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -91,7 +91,7 @@ static BIT_STRING_BITNAME key_usage_type_table[] = {
 const X509V3_EXT_METHOD v3_nscert = {
 	.ext_nid = NID_netscape_cert_type,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(ASN1_BIT_STRING),
+	.it = &ASN1_BIT_STRING_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -108,7 +108,7 @@ const X509V3_EXT_METHOD v3_nscert = {
 const X509V3_EXT_METHOD v3_key_usage = {
 	.ext_nid = NID_key_usage,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(ASN1_BIT_STRING),
+	.it = &ASN1_BIT_STRING_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_conf.c,v 1.19 2015/12/14 03:39:14 beck Exp $ */
+/* $OpenBSD: v3_conf.c,v 1.20 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -173,7 +173,7 @@ do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid, int crit, char *value)
 
 	ext = do_ext_i2d(method, ext_nid, crit, ext_struc);
 	if (method->it)
-		ASN1_item_free(ext_struc, ASN1_ITEM_ptr(method->it));
+		ASN1_item_free(ext_struc, method->it);
 	else
 		method->ext_free(ext_struc);
 	return ext;
@@ -192,7 +192,7 @@ do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid, int crit,
 	if (method->it) {
 		ext_der = NULL;
 		ext_len = ASN1_item_i2d(ext_struc, &ext_der,
-		    ASN1_ITEM_ptr(method->it));
+		    method->it);
 		if (ext_len < 0)
 			goto merr;
 	} 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 @@
-/* $OpenBSD: v3_cpols.c,v 1.23 2015/09/30 18:21:50 jsing Exp $ */
+/* $OpenBSD: v3_cpols.c,v 1.24 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -85,7 +85,7 @@ static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos);
 const X509V3_EXT_METHOD v3_cpols = {
 	.ext_nid = NID_certificate_policies,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(CERTIFICATEPOLICIES),
+	.it = &CERTIFICATEPOLICIES_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_crld.c,v 1.19 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_crld.c,v 1.20 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -73,7 +73,7 @@ static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
 const X509V3_EXT_METHOD v3_crld = {
 	.ext_nid = NID_crl_distribution_points,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(CRL_DIST_POINTS),
+	.it = &CRL_DIST_POINTS_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -90,7 +90,7 @@ const X509V3_EXT_METHOD v3_crld = {
 const X509V3_EXT_METHOD v3_freshest_crl = {
 	.ext_nid = NID_freshest_crl,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(CRL_DIST_POINTS),
+	.it = &CRL_DIST_POINTS_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -642,7 +642,7 @@ static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
 
 const X509V3_EXT_METHOD v3_idp = {
 	NID_issuing_distribution_point, X509V3_EXT_MULTILINE,
-	ASN1_ITEM_ref(ISSUING_DIST_POINT),
+	&ISSUING_DIST_POINT_it,
 	0, 0, 0, 0,
 	0, 0,
 	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 @@
-/* $OpenBSD: v3_enum.c,v 1.11 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_enum.c,v 1.12 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -78,7 +78,7 @@ static ENUMERATED_NAMES crl_reasons[] = {
 const X509V3_EXT_METHOD v3_crl_reason = {
 	.ext_nid = NID_crl_reason,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(ASN1_ENUMERATED),
+	.it = &ASN1_ENUMERATED_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_extku.c,v 1.13 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_extku.c,v 1.14 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -71,7 +71,7 @@ static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(
 const X509V3_EXT_METHOD v3_ext_ku = {
 	.ext_nid = NID_ext_key_usage,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
+	.it = &EXTENDED_KEY_USAGE_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -89,7 +89,7 @@ const X509V3_EXT_METHOD v3_ext_ku = {
 const X509V3_EXT_METHOD v3_ocsp_accresp = {
 	.ext_nid = NID_id_pkix_OCSP_acceptableResponses,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
+	.it = &EXTENDED_KEY_USAGE_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_ia5.c,v 1.15 2015/09/30 18:21:50 jsing Exp $ */
+/* $OpenBSD: v3_ia5.c,v 1.16 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -72,7 +72,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
 	{
 		.ext_nid = NID_netscape_base_url,
 		.ext_flags = 0,
-		.it = ASN1_ITEM_ref(ASN1_IA5STRING),
+		.it = &ASN1_IA5STRING_it,
 		.ext_new = NULL,
 		.ext_free = NULL,
 		.d2i = NULL,
@@ -88,7 +88,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
 	{
 		.ext_nid = NID_netscape_revocation_url,
 		.ext_flags = 0,
-		.it = ASN1_ITEM_ref(ASN1_IA5STRING),
+		.it = &ASN1_IA5STRING_it,
 		.ext_new = NULL,
 		.ext_free = NULL,
 		.d2i = NULL,
@@ -104,7 +104,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
 	{
 		.ext_nid = NID_netscape_ca_revocation_url,
 		.ext_flags = 0,
-		.it = ASN1_ITEM_ref(ASN1_IA5STRING),
+		.it = &ASN1_IA5STRING_it,
 		.ext_new = NULL,
 		.ext_free = NULL,
 		.d2i = NULL,
@@ -120,7 +120,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
 	{
 		.ext_nid = NID_netscape_renewal_url,
 		.ext_flags = 0,
-		.it = ASN1_ITEM_ref(ASN1_IA5STRING),
+		.it = &ASN1_IA5STRING_it,
 		.ext_new = NULL,
 		.ext_free = NULL,
 		.d2i = NULL,
@@ -136,7 +136,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
 	{
 		.ext_nid = NID_netscape_ca_policy_url,
 		.ext_flags = 0,
-		.it = ASN1_ITEM_ref(ASN1_IA5STRING),
+		.it = &ASN1_IA5STRING_it,
 		.ext_new = NULL,
 		.ext_free = NULL,
 		.d2i = NULL,
@@ -152,7 +152,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
 	{
 		.ext_nid = NID_netscape_ssl_server_name,
 		.ext_flags = 0,
-		.it = ASN1_ITEM_ref(ASN1_IA5STRING),
+		.it = &ASN1_IA5STRING_it,
 		.ext_new = NULL,
 		.ext_free = NULL,
 		.d2i = NULL,
@@ -168,7 +168,7 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
 	{
 		.ext_nid = NID_netscape_comment,
 		.ext_flags = 0,
-		.it = ASN1_ITEM_ref(ASN1_IA5STRING),
+		.it = &ASN1_IA5STRING_it,
 		.ext_new = NULL,
 		.ext_free = NULL,
 		.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 @@
-/* $OpenBSD: v3_info.c,v 1.23 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_info.c,v 1.24 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -74,7 +74,7 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(
 const X509V3_EXT_METHOD v3_info = {
 	.ext_nid = NID_info_access,
 	.ext_flags = X509V3_EXT_MULTILINE,
-	.it = ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
+	.it = &AUTHORITY_INFO_ACCESS_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -91,7 +91,7 @@ const X509V3_EXT_METHOD v3_info = {
 const X509V3_EXT_METHOD v3_sinfo = {
 	.ext_nid = NID_sinfo_access,
 	.ext_flags = X509V3_EXT_MULTILINE,
-	.it = ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
+	.it = &AUTHORITY_INFO_ACCESS_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_int.c,v 1.10 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_int.c,v 1.11 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -63,7 +63,7 @@
 const X509V3_EXT_METHOD v3_crl_num = {
 	.ext_nid = NID_crl_number,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(ASN1_INTEGER),
+	.it = &ASN1_INTEGER_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -80,7 +80,7 @@ const X509V3_EXT_METHOD v3_crl_num = {
 const X509V3_EXT_METHOD v3_delta_crl = {
 	.ext_nid = NID_delta_crl,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(ASN1_INTEGER),
+	.it = &ASN1_INTEGER_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -101,7 +101,7 @@ s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx, char *value)
 }
 
 const X509V3_EXT_METHOD v3_inhibit_anyp = {
-	NID_inhibit_any_policy, 0, ASN1_ITEM_ref(ASN1_INTEGER),
+	NID_inhibit_any_policy, 0, &ASN1_INTEGER_it,
 	0, 0, 0, 0,
 	(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
 	(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 @@
-/* $OpenBSD: v3_lib.c,v 1.14 2015/02/10 11:22:22 jsing Exp $ */
+/* $OpenBSD: v3_lib.c,v 1.15 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -194,7 +194,7 @@ X509V3_EXT_d2i(X509_EXTENSION *ext)
 	p = ext->value->data;
 	if (method->it)
 		return ASN1_item_d2i(NULL, &p, ext->value->length,
-		    ASN1_ITEM_ptr(method->it));
+		    method->it);
 	return method->d2i(NULL, &p, ext->value->length);
 }
 
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 @@
-/* $OpenBSD: v3_ncons.c,v 1.9 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_ncons.c,v 1.10 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -82,7 +82,7 @@ static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base);
 const X509V3_EXT_METHOD v3_name_constraints = {
 	.ext_nid = NID_name_constraints,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(NAME_CONSTRAINTS),
+	.it = &NAME_CONSTRAINTS_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_ocsp.c,v 1.13 2015/09/30 18:41:06 jsing Exp $ */
+/* $OpenBSD: v3_ocsp.c,v 1.14 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -96,7 +96,7 @@ static int i2r_ocsp_serviceloc(const X509V3_EXT_METHOD *method, void *in,
 const X509V3_EXT_METHOD v3_ocsp_crlid = {
 	.ext_nid = NID_id_pkix_OCSP_CrlID,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(OCSP_CRLID),
+	.it = &OCSP_CRLID_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -113,7 +113,7 @@ const X509V3_EXT_METHOD v3_ocsp_crlid = {
 const X509V3_EXT_METHOD v3_ocsp_acutoff = {
 	.ext_nid = NID_id_pkix_OCSP_archiveCutoff,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
+	.it = &ASN1_GENERALIZEDTIME_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -130,7 +130,7 @@ const X509V3_EXT_METHOD v3_ocsp_acutoff = {
 const X509V3_EXT_METHOD v3_crl_invdate = {
 	.ext_nid = NID_invalidity_date,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
+	.it = &ASN1_GENERALIZEDTIME_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -147,7 +147,7 @@ const X509V3_EXT_METHOD v3_crl_invdate = {
 const X509V3_EXT_METHOD v3_crl_hold = {
 	.ext_nid = NID_hold_instruction_code,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(ASN1_OBJECT),
+	.it = &ASN1_OBJECT_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -181,7 +181,7 @@ const X509V3_EXT_METHOD v3_ocsp_nonce = {
 const X509V3_EXT_METHOD v3_ocsp_nocheck = {
 	.ext_nid = NID_id_pkix_OCSP_noCheck,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(ASN1_NULL),
+	.it = &ASN1_NULL_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
@@ -198,7 +198,7 @@ const X509V3_EXT_METHOD v3_ocsp_nocheck = {
 const X509V3_EXT_METHOD v3_ocsp_serviceloc = {
 	.ext_nid = NID_id_pkix_OCSP_serviceLocator,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(OCSP_SERVICELOC),
+	.it = &OCSP_SERVICELOC_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_pci.c,v 1.10 2015/07/29 16:13:49 jsing Exp $ */
+/* $OpenBSD: v3_pci.c,v 1.11 2016/12/30 15:54:49 jsing Exp $ */
 /* Contributed to the OpenSSL Project 2004
  * by Richard Levitte (richard@levitte.org)
  */
@@ -49,7 +49,7 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
 const X509V3_EXT_METHOD v3_pci = {
 	.ext_nid = NID_proxyCertInfo,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),
+	.it = &PROXY_CERT_INFO_EXTENSION_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_pcons.c,v 1.9 2015/07/29 16:13:49 jsing Exp $ */
+/* $OpenBSD: v3_pcons.c,v 1.10 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -74,7 +74,7 @@ static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method,
 const X509V3_EXT_METHOD v3_policy_constraints = {
 	.ext_nid = NID_policy_constraints,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(POLICY_CONSTRAINTS),
+	.it = &POLICY_CONSTRAINTS_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_pku.c,v 1.12 2015/07/29 16:13:49 jsing Exp $ */
+/* $OpenBSD: v3_pku.c,v 1.13 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -70,7 +70,7 @@ static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, X509V
 const X509V3_EXT_METHOD v3_pkey_usage_period = {
 	.ext_nid = NID_private_key_usage_period,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(PKEY_USAGE_PERIOD),
+	.it = &PKEY_USAGE_PERIOD_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_pmaps.c,v 1.9 2015/07/29 16:13:49 jsing Exp $ */
+/* $OpenBSD: v3_pmaps.c,v 1.10 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -72,7 +72,7 @@ static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(
 const X509V3_EXT_METHOD v3_policy_mappings = {
 	.ext_nid = NID_policy_mappings,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(POLICY_MAPPINGS),
+	.it = &POLICY_MAPPINGS_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_prn.c,v 1.18 2015/07/29 14:58:34 jsing Exp $ */
+/* $OpenBSD: v3_prn.c,v 1.19 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -115,7 +115,7 @@ X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent)
 	p = ext->value->data;
 	if (method->it)
 		ext_str = ASN1_item_d2i(NULL, &p, ext->value->length,
-		    ASN1_ITEM_ptr(method->it));
+		    method->it);
 	else
 		ext_str = method->d2i(NULL, &p, ext->value->length);
 
@@ -145,7 +145,7 @@ err:
 	sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
 	free(value);
 	if (method->it)
-		ASN1_item_free(ext_str, ASN1_ITEM_ptr(method->it));
+		ASN1_item_free(ext_str, method->it);
 	else
 		method->ext_free(ext_str);
 	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 @@
-/* $OpenBSD: v3_skey.c,v 1.13 2015/09/30 18:41:06 jsing Exp $ */
+/* $OpenBSD: v3_skey.c,v 1.14 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -68,7 +68,7 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
 const X509V3_EXT_METHOD v3_skey_id = {
 	.ext_nid = NID_subject_key_identifier,
 	.ext_flags = 0,
-	.it = ASN1_ITEM_ref(ASN1_OCTET_STRING),
+	.it = &ASN1_OCTET_STRING_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.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 @@
-/* $OpenBSD: v3_sxnet.c,v 1.17 2015/09/30 17:30:16 jsing Exp $ */
+/* $OpenBSD: v3_sxnet.c,v 1.18 2016/12/30 15:54:49 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -79,7 +79,7 @@ static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
 const X509V3_EXT_METHOD v3_sxnet = {
 	.ext_nid = NID_sxnet,
 	.ext_flags = X509V3_EXT_MULTILINE,
-	.it = ASN1_ITEM_ref(SXNET),
+	.it = &SXNET_it,
 	.ext_new = NULL,
 	.ext_free = NULL,
 	.d2i = NULL,
-- 
cgit v1.2.3-55-g6feb