[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  b385889640517531a9cfeb672b15db7089b1bbb8 (commit)
      from  e45c78fc98aca728f73d7d1b4b85611efdd6b1d6 (commit)


- Log -----------------------------------------------------------------
commit b385889640517531a9cfeb672b15db7089b1bbb8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Jul 5 23:24:26 2016 +0100

    Don't indicate errors during initial adb decode.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/tasn_dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index a1b0e28..3af1d1b 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -300,7 +300,7 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
             if (tt->flags & ASN1_TFLG_ADB_MASK) {
                 const ASN1_TEMPLATE *seqtt;
                 ASN1_VALUE **pseqval;
-                seqtt = asn1_do_adb(pval, tt, 1);
+                seqtt = asn1_do_adb(pval, tt, 0);
                 if (seqtt == NULL)
                     continue;
                 pseqval = asn1_get_field_ptr(pval, seqtt);