From db77175e992311dd76f8f54475a8762fb76fbacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 27 Aug 2013 15:11:23 +0200 Subject: [PATCH] Make ecdsa_verify() return value more explicit --- include/polarssl/ecp.h | 3 ++- library/ecdsa.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/polarssl/ecp.h b/include/polarssl/ecp.h index 36c6185468..ad31bff66d 100644 --- a/include/polarssl/ecp.h +++ b/include/polarssl/ecp.h @@ -34,8 +34,9 @@ */ #define POLARSSL_ERR_ECP_BAD_INPUT_DATA -0x4F80 /**< Bad input parameters to function. */ #define POLARSSL_ERR_ECP_BUFFER_TOO_SMALL -0x4F00 /**< The buffer is too small to write to. */ -#define POLARSSL_ERR_ECP_GENERIC -0x4E80 /**< Generic ECP error */ +#define POLARSSL_ERR_ECP_GENERIC -0x4E80 /**< Generic ECP error. */ #define POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE -0x4E00 /**< Requested curve not available. */ +#define POLARSSL_ERR_ECP_VERIFY_FAILED -0x4E00 /**< The signature is not valid. */ #ifdef __cplusplus extern "C" { diff --git a/library/ecdsa.c b/library/ecdsa.c index bdb356750e..67774c9d0e 100644 --- a/library/ecdsa.c +++ b/library/ecdsa.c @@ -134,7 +134,7 @@ int ecdsa_verify( const ecp_group *grp, if( mpi_cmp_int( r, 1 ) < 0 || mpi_cmp_mpi( r, &grp->N ) >= 0 || mpi_cmp_int( s, 1 ) < 0 || mpi_cmp_mpi( s, &grp->N ) >= 0 ) { - ret = POLARSSL_ERR_ECP_BAD_INPUT_DATA; + ret = POLARSSL_ERR_ECP_VERIFY_FAILED; goto cleanup; } @@ -168,7 +168,7 @@ int ecdsa_verify( const ecp_group *grp, if( ecp_is_zero( &R ) ) { - ret = POLARSSL_ERR_ECP_BAD_INPUT_DATA; + ret = POLARSSL_ERR_ECP_VERIFY_FAILED; goto cleanup; } @@ -177,7 +177,7 @@ int ecdsa_verify( const ecp_group *grp, */ if( mpi_cmp_mpi( &R.X, r ) != 0 ) { - ret = POLARSSL_ERR_ECP_BAD_INPUT_DATA; + ret = POLARSSL_ERR_ECP_VERIFY_FAILED; goto cleanup; }