AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Yet another dependency issue (PKCS1_V15)

Browse Source 
Found by running:

CC=clang cmake -D CMAKE_BUILD_TYPE="Check"
tests/scripts/depend-pkalgs.pl

(Also tested with same command but CC=gcc)

Another PR will address improving all.sh and/or the depend-xxx.pl scripts
themselves to catch this kind of thing.
This commit is contained in:
Manuel Pégourié-Gonnard 2018-03-13 13:27:14 +01:00
parent 88a8dcb38e
commit 1ba8a3fc55
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/rsa.c
View File

@ -75,6 +75,7 @@ static void mbedtls_zeroize( void *v, size_t n ) {
volatile unsigned char *p = (unsigned char*)v; while( n-- ) *p++ = 0; volatile unsigned char *p = (unsigned char*)v; while( n-- ) *p++ = 0;
} }
#if defined(MBEDTLS_PKCS1_V15)
/* constant-time buffer comparison */ /* constant-time buffer comparison */
static inline int mbedtls_safer_memcmp( const void *a, const void *b, size_t n ) static inline int mbedtls_safer_memcmp( const void *a, const void *b, size_t n )
{ {
@ -88,6 +89,7 @@ static inline int mbedtls_safer_memcmp( const void *a, const void *b, size_t n )
return( diff ); return( diff );
} }
#endif /* MBEDTLS_PKCS1_V15 */
int mbedtls_rsa_import( mbedtls_rsa_context *ctx, int mbedtls_rsa_import( mbedtls_rsa_context *ctx,
const mbedtls_mpi *N, const mbedtls_mpi *N,

4
tests/suites/test_suite_rsa.function
View File

@ -122,7 +122,6 @@ void rsa_pkcs1_sign_raw( char *message_hex_string, char *hash_result_string,
char *input_N, int radix_E, char *input_E, char *input_N, int radix_E, char *input_E,
char *result_hex_str ) char *result_hex_str )
{ {
int res;
unsigned char message_str[1000]; unsigned char message_str[1000];
unsigned char hash_result[1000]; unsigned char hash_result[1000];
unsigned char output[1000]; unsigned char output[1000];
@ -167,6 +166,7 @@ void rsa_pkcs1_sign_raw( char *message_hex_string, char *hash_result_string,
/* For PKCS#1 v1.5, there is an alternative way to generate signatures */ /* For PKCS#1 v1.5, there is an alternative way to generate signatures */
if( padding_mode == MBEDTLS_RSA_PKCS_V15 ) if( padding_mode == MBEDTLS_RSA_PKCS_V15 )
{ {
int res;
memset( output, 0x00, 1000 ); memset( output, 0x00, 1000 );
memset( output_str, 0x00, 1000 ); memset( output_str, 0x00, 1000 );
@ -203,7 +203,6 @@ void rsa_pkcs1_verify_raw( char *message_hex_string, char *hash_result_string,
char *input_N, int radix_E, char *input_E, char *input_N, int radix_E, char *input_E,
char *result_hex_str, int correct ) char *result_hex_str, int correct )
{ {
int res;
unsigned char message_str[1000]; unsigned char message_str[1000];
unsigned char hash_result[1000]; unsigned char hash_result[1000];
unsigned char result_str[1000]; unsigned char result_str[1000];
@ -240,6 +239,7 @@ void rsa_pkcs1_verify_raw( char *message_hex_string, char *hash_result_string,
/* For PKCS#1 v1.5, there is an alternative way to verify signatures */ /* For PKCS#1 v1.5, there is an alternative way to verify signatures */
if( padding_mode == MBEDTLS_RSA_PKCS_V15 ) if( padding_mode == MBEDTLS_RSA_PKCS_V15 )
{ {
int res;
int ok; int ok;
size_t olen; size_t olen;