diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index e567e636d..78318cb99 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -554,7 +554,7 @@ static int uecc_eckey_check_pair( const void *pub, const void *prv )
         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 )
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index f56475be0..8e1c37485 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -75,7 +75,7 @@ int mbedtls_ssl_ecdh_read_peerkey( mbedtls_ssl_context *ssl,
     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 @@ int mbedtls_ssl_ecdh_read_peerkey( mbedtls_ssl_context *ssl,
                                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 );