mirror of
https://git.suyu.dev/suyu/mbedtls.git
synced 2026-02-18 16:33:01 +00:00
Merged additional tests and improved code coverage
Conflicts: ChangeLog
This commit is contained in:
@@ -49,7 +49,9 @@
|
||||
#include "polarssl/x509.h"
|
||||
#include "polarssl/xtea.h"
|
||||
#include "polarssl/pkcs5.h"
|
||||
#include "polarssl/pbkdf2.h"
|
||||
#include "polarssl/ecp.h"
|
||||
#include "polarssl/timing.h"
|
||||
|
||||
#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C)
|
||||
#include "polarssl/memory.h"
|
||||
@@ -171,11 +173,6 @@ int main( int argc, char *argv[] )
|
||||
return( ret );
|
||||
#endif
|
||||
|
||||
#if defined(POLARSSL_PKCS5_C)
|
||||
if( ( ret = pkcs5_self_test( v ) ) != 0 )
|
||||
return( ret );
|
||||
#endif
|
||||
|
||||
#if defined(POLARSSL_ECP_C)
|
||||
if( ( ret = ecp_self_test( v ) ) != 0 )
|
||||
return( ret );
|
||||
@@ -186,6 +183,23 @@ int main( int argc, char *argv[] )
|
||||
return( ret );
|
||||
#endif
|
||||
|
||||
/* Slow tests last */
|
||||
|
||||
#if defined(POLARSSL_PBKDF2_C)
|
||||
if( ( ret = pbkdf2_self_test( v ) ) != 0 )
|
||||
return( ret );
|
||||
#else
|
||||
#if defined(POLARSSL_PKCS5_C)
|
||||
if( ( ret = pkcs5_self_test( v ) ) != 0 )
|
||||
return( ret );
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(POLARSSL_TIMING_C)
|
||||
if( ( ret = timing_self_test( v ) ) != 0 )
|
||||
return( ret );
|
||||
#endif
|
||||
|
||||
#else
|
||||
printf( " POLARSSL_SELF_TEST not defined.\n" );
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user