commit 35b86a872f5595f91bdc637ac191290ee3f23bd2
author Hanno Becker <hanno.becker@arm.com> Tue Jun 25 09:50:07 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Tue Jun 25 10:41:34 2019 +0100
tree 2a1823b82ee55852a42dcdc7bad48481910a07da
parent 2656bfe9b0dd37102dce3e5fa56467c263af47d9

[FIXUP] Fix bug in ASN.1 traversal of silently ignored tag

library/asn1parse.c

diff --git a/library/asn1parse.c b/library/asn1parse.c
index 68a70e6..aac253b 100644
--- a/library/asn1parse.c
+++ b/library/asn1parse.c
@@ -273,11 +273,11 @@
         if( ( tag & tag_must_mask ) != tag_must_val )
             return( MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
 
+        if( ( ret = mbedtls_asn1_get_len( p, end, &len ) ) != 0 )
+            return( ret );
+
         if( ( tag & tag_may_mask ) == tag_may_val )
         {
-            if( ( ret = mbedtls_asn1_get_len( p, end, &len ) ) != 0 )
-                return( ret );
-
             if( cb != NULL )
             {
                 ret = cb( ctx, tag, *p, len );