summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/tasn_dec.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/tasn_dec.c')
-rw-r--r--src/lib/libcrypto/asn1/tasn_dec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c
index e75fe53633..de78164995 100644
--- a/src/lib/libcrypto/asn1/tasn_dec.c
+++ b/src/lib/libcrypto/asn1/tasn_dec.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tasn_dec.c,v 1.32 2016/05/04 15:00:24 tedu Exp $ */ 1/* $OpenBSD: tasn_dec.c,v 1.33 2016/12/30 16:04:34 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 2000. 3 * project 2000.
4 */ 4 */
@@ -589,7 +589,7 @@ asn1_template_noexp_d2i(ASN1_VALUE **val, const unsigned char **in, long len,
589 while (sk_ASN1_VALUE_num(sktmp) > 0) { 589 while (sk_ASN1_VALUE_num(sktmp) > 0) {
590 vtmp = sk_ASN1_VALUE_pop(sktmp); 590 vtmp = sk_ASN1_VALUE_pop(sktmp);
591 ASN1_item_ex_free(&vtmp, 591 ASN1_item_ex_free(&vtmp,
592 ASN1_ITEM_ptr(tt->item)); 592 tt->item);
593 } 593 }
594 } 594 }
595 595
@@ -616,7 +616,7 @@ asn1_template_noexp_d2i(ASN1_VALUE **val, const unsigned char **in, long len,
616 } 616 }
617 skfield = NULL; 617 skfield = NULL;
618 if (!ASN1_item_ex_d2i(&skfield, &p, len, 618 if (!ASN1_item_ex_d2i(&skfield, &p, len,
619 ASN1_ITEM_ptr(tt->item), -1, 0, 0, ctx)) { 619 tt->item, -1, 0, 0, ctx)) {
620 ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I, 620 ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I,
621 ERR_R_NESTED_ASN1_ERROR); 621 ERR_R_NESTED_ASN1_ERROR);
622 goto err; 622 goto err;
@@ -637,7 +637,7 @@ asn1_template_noexp_d2i(ASN1_VALUE **val, const unsigned char **in, long len,
637 } else if (flags & ASN1_TFLG_IMPTAG) { 637 } else if (flags & ASN1_TFLG_IMPTAG) {
638 /* IMPLICIT tagging */ 638 /* IMPLICIT tagging */
639 ret = ASN1_item_ex_d2i(val, &p, len, 639 ret = ASN1_item_ex_d2i(val, &p, len,
640 ASN1_ITEM_ptr(tt->item), tt->tag, aclass, opt, ctx); 640 tt->item, tt->tag, aclass, opt, ctx);
641 if (!ret) { 641 if (!ret) {
642 ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I, 642 ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I,
643 ERR_R_NESTED_ASN1_ERROR); 643 ERR_R_NESTED_ASN1_ERROR);
@@ -646,7 +646,7 @@ asn1_template_noexp_d2i(ASN1_VALUE **val, const unsigned char **in, long len,
646 return -1; 646 return -1;
647 } else { 647 } else {
648 /* Nothing special */ 648 /* Nothing special */
649 ret = ASN1_item_ex_d2i(val, &p, len, ASN1_ITEM_ptr(tt->item), 649 ret = ASN1_item_ex_d2i(val, &p, len, tt->item,
650 -1, tt->flags & ASN1_TFLG_COMBINE, opt, ctx); 650 -1, tt->flags & ASN1_TFLG_COMBINE, opt, ctx);
651 if (!ret) { 651 if (!ret) {
652 ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I, 652 ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I,