commit fd64f14ef9a1a8b9ba328a1494f5b094c67b700e
author Hanno Becker <hanno.becker@arm.com> Fri Jun 07 11:47:12 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Tue Jun 25 09:11:11 2019 +0100
tree 3f83d47d2e2fd09c29eea8b3f1319a8d957795e3
parent 938a80507a3ad9597b6599f97d586691bfbf8328

Remove redundant CRT version check during CRT parsing

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index ee9e95d..c79193e 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -1297,26 +1297,25 @@
     p += len;
     frame->pubkey_raw.len = p - frame->pubkey_raw.p;
 
-    /*
-     *  issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
-     *                       -- If present, version shall be v2 or v3
-     */
     if( frame->version == 2 || frame->version == 3 )
     {
+        /*
+         *  issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
+         *                       -- If present, version shall be v2 or v3
+         */
+
         ret = x509_get_uid( &p, end, &tmp, 1 /* implicit tag */ );
         if( ret != 0 )
             return( ret );
 
         frame->issuer_id.p   = tmp.p;
         frame->issuer_id.len = tmp.len;
-    }
 
-    /*
-     *  subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
-     *                       -- If present, version shall be v2 or v3
-     */
-    if( frame->version == 2 || frame->version == 3 )
-    {
+        /*
+         *  subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
+         *                       -- If present, version shall be v2 or v3
+         */
+
         ret = x509_get_uid( &p, end, &tmp, 2 /* implicit tag */ );
         if( ret != 0 )
             return( ret );