1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/libcrypto/asn1/tasn_enc.c b/src/lib/libcrypto/asn1/tasn_enc.c
index 7d90c68c85..f3341901fe 100644
--- a/src/lib/libcrypto/asn1/tasn_enc.c
+++ b/src/lib/libcrypto/asn1/tasn_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tasn_enc.c,v 1.20 2016/05/04 15:00:24 tedu Exp $ */
+/* $OpenBSD: tasn_enc.c,v 1.21 2016/12/30 16:04:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -330,7 +330,7 @@ asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 for (i = 0; i < sk_ASN1_VALUE_num(sk); i++) {
                         skitem = sk_ASN1_VALUE_value(sk, i);
                         skcontlen += ASN1_item_ex_i2d(&skitem, NULL,
-                            ASN1_ITEM_ptr(tt->item), -1, iclass);
+                            tt->item, -1, iclass);
                 }
                 sklen = ASN1_object_size(ndef, skcontlen, sktag);
                 /* If EXPLICIT need length of surrounding tag */
@@ -349,7 +349,7 @@ asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 /* SET or SEQUENCE and IMPLICIT tag */
                 ASN1_put_object(out, ndef, skcontlen, sktag, skaclass);
                 /* And the stuff itself */
-                asn1_set_seq_out(sk, out, skcontlen, ASN1_ITEM_ptr(tt->item),
+                asn1_set_seq_out(sk, out, skcontlen, tt->item,
                     isset, iclass);
                 if (ndef == 2) {
                         ASN1_put_eoc(out);
@@ -363,7 +363,7 @@ asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
         if (flags & ASN1_TFLG_EXPTAG) {
                 /* EXPLICIT tagging */
                 /* Find length of tagged item */
-                i = ASN1_item_ex_i2d(pval, NULL, ASN1_ITEM_ptr(tt->item),
+                i = ASN1_item_ex_i2d(pval, NULL, tt->item,
                     -1, iclass);
                 if (!i)
                         return 0;
@@ -372,7 +372,7 @@ asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 if (out) {
                         /* Output tag and item */
                         ASN1_put_object(out, ndef, i, ttag, tclass);
-                        ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item),
+                        ASN1_item_ex_i2d(pval, out, tt->item,
                             -1, iclass);
                         if (ndef == 2)
                                 ASN1_put_eoc(out);
@@ -381,7 +381,7 @@ asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
         }
 
         /* Either normal or IMPLICIT tagging: combine class and flags */
-        return ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item),
+        return ASN1_item_ex_i2d(pval, out, tt->item,
             ttag, tclass | iclass);
 }