commit 68d5478d8d05fa02dbbac1e14a0c7afc9d5adcf8
author Hanno Becker <hanno.becker@arm.com> Tue Aug 20 13:19:09 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Wed Sep 04 16:17:25 2019 +0100
tree d5ce55d89a4f544f6aad275eb53cc7a2ddb4fd28
parent aebffdd363d8c9879f9600a82b7036ebfaa02ecf

TinyCrypt PK parse: Simplify TinyCrypt public key parsing

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index c8171f1..7c8cd80 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -550,8 +550,7 @@
 static int uecc_public_key_read_binary( uint8_t *pt,
                                    const unsigned char *buf, size_t ilen )
 {
-
-    if( ilen < 1 )
+    if( ilen != 2 * NUM_ECC_BYTES + 1 )
         return( MBEDTLS_ERR_PK_INVALID_PUBKEY );
 
     /* We are not handling the point at infinity. */
@@ -559,9 +558,6 @@
     if( buf[0] != 0x04 )
         return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
 
-    if( ilen != 2 * NUM_ECC_BYTES + 1 )
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY );
-
     memcpy( pt, buf + 1, ilen - 1);
 
     return( 0 );