commit c64d5af9ab9f55ca791d5fec1588d623f39f18a2
author Hanno Becker <hanno.becker@arm.com> Fri Aug 23 13:14:36 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Wed Sep 04 16:17:25 2019 +0100
tree ed75731f9c09db26a4822b183a4220f4fbba0ca6
parent c10c9bfc1099e208906919b97bb8fa0400e48cd2

Fixup: Don't use legacy ECC error code from TinyCrypt

We want to be able to remove legacy ECC entirely when using TinyCrypt,
including their identifiers.

library/pk_wrap.c

diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index e567e63..78318cb 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -554,7 +554,7 @@
         return( 0 );
     }
 
-    return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
 }
 
 static int uecc_eckey_can_do( mbedtls_pk_type_t type )

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index f56475b..8e1c374 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -75,7 +75,7 @@
     if( (size_t)( end - *p ) < secp256r1_uncompressed_point_length )
     {
         MBEDTLS_SSL_DEBUG_MSG( 3, ( "Bad ECDH peer pubkey (too short)" ) );
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
     }
 
     if( (*p)[0] != 2 * NUM_ECC_BYTES + 1 ||
@@ -86,7 +86,7 @@
                                0x04,
                                (unsigned) (*p)[0],
                                (unsigned) (*p)[1] ) );
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
     }
 
     memcpy( ssl->handshake->ecdh_peerkey, *p + 2, 2 * NUM_ECC_BYTES );