mirror of
https://github.com/yuzu-mirror/mbedtls.git
synced 2026-04-04 14:08:39 +00:00
Switch to the new code style
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
parent
fd13a0f851
commit
449bd8303e
442 changed files with 86735 additions and 89438 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -31,9 +31,9 @@ int main()
|
|||
/* This version string is 18 bytes long, as advised by version.h. */
|
||||
char version[18];
|
||||
|
||||
mbedtls_version_get_string_full( version );
|
||||
mbedtls_version_get_string_full(version);
|
||||
|
||||
mbedtls_printf( "Built against %s\n", version );
|
||||
mbedtls_printf("Built against %s\n", version);
|
||||
|
||||
return( 0 );
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ int main()
|
|||
/* This version string is 18 bytes long, as advised by version.h. */
|
||||
char version[18];
|
||||
|
||||
mbedtls_version_get_string_full( version );
|
||||
mbedtls_version_get_string_full(version);
|
||||
|
||||
mbedtls_printf( "Built against %s\n", version );
|
||||
mbedtls_printf("Built against %s\n", version);
|
||||
|
||||
return( 0 );
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ int main()
|
|||
/* This version string is 18 bytes long, as advised by version.h. */
|
||||
char version[18];
|
||||
|
||||
mbedtls_version_get_string_full( version );
|
||||
mbedtls_version_get_string_full(version);
|
||||
|
||||
mbedtls_printf( "Built against %s\n", version );
|
||||
mbedtls_printf("Built against %s\n", version);
|
||||
|
||||
return( 0 );
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,67 +37,68 @@
|
|||
|
||||
#include <dlfcn.h>
|
||||
|
||||
#define CHECK_DLERROR( function, argument ) \
|
||||
#define CHECK_DLERROR(function, argument) \
|
||||
do \
|
||||
{ \
|
||||
char *CHECK_DLERROR_error = dlerror ( ); \
|
||||
if( CHECK_DLERROR_error != NULL ) \
|
||||
char *CHECK_DLERROR_error = dlerror(); \
|
||||
if (CHECK_DLERROR_error != NULL) \
|
||||
{ \
|
||||
fprintf( stderr, "Dynamic loading error for %s(%s): %s\n", \
|
||||
function, argument, CHECK_DLERROR_error ); \
|
||||
mbedtls_exit( MBEDTLS_EXIT_FAILURE ); \
|
||||
fprintf(stderr, "Dynamic loading error for %s(%s): %s\n", \
|
||||
function, argument, CHECK_DLERROR_error); \
|
||||
mbedtls_exit(MBEDTLS_EXIT_FAILURE); \
|
||||
} \
|
||||
} \
|
||||
while( 0 )
|
||||
while (0)
|
||||
|
||||
int main( void )
|
||||
int main(void)
|
||||
{
|
||||
#if defined(MBEDTLS_MD_C) || defined(MBEDTLS_SSL_TLS_C)
|
||||
unsigned n;
|
||||
#endif
|
||||
|
||||
#if defined(MBEDTLS_SSL_TLS_C)
|
||||
void *tls_so = dlopen( TLS_SO_FILENAME, RTLD_NOW );
|
||||
CHECK_DLERROR( "dlopen", TLS_SO_FILENAME );
|
||||
const int *( *ssl_list_ciphersuites )( void ) =
|
||||
dlsym( tls_so, "mbedtls_ssl_list_ciphersuites" );
|
||||
CHECK_DLERROR( "dlsym", "mbedtls_ssl_list_ciphersuites" );
|
||||
const int *ciphersuites = ssl_list_ciphersuites( );
|
||||
for( n = 0; ciphersuites[n] != 0; n++ )
|
||||
/* nothing to do, we're just counting */;
|
||||
mbedtls_printf( "dlopen(%s): %u ciphersuites\n",
|
||||
TLS_SO_FILENAME, n );
|
||||
dlclose( tls_so );
|
||||
CHECK_DLERROR( "dlclose", TLS_SO_FILENAME );
|
||||
void *tls_so = dlopen(TLS_SO_FILENAME, RTLD_NOW);
|
||||
CHECK_DLERROR("dlopen", TLS_SO_FILENAME);
|
||||
const int *(*ssl_list_ciphersuites)(void) =
|
||||
dlsym(tls_so, "mbedtls_ssl_list_ciphersuites");
|
||||
CHECK_DLERROR("dlsym", "mbedtls_ssl_list_ciphersuites");
|
||||
const int *ciphersuites = ssl_list_ciphersuites();
|
||||
for (n = 0; ciphersuites[n] != 0; n++) {/* nothing to do, we're just counting */
|
||||
;
|
||||
}
|
||||
mbedtls_printf("dlopen(%s): %u ciphersuites\n",
|
||||
TLS_SO_FILENAME, n);
|
||||
dlclose(tls_so);
|
||||
CHECK_DLERROR("dlclose", TLS_SO_FILENAME);
|
||||
#endif /* MBEDTLS_SSL_TLS_C */
|
||||
|
||||
#if defined(MBEDTLS_X509_CRT_PARSE_C)
|
||||
void *x509_so = dlopen( X509_SO_FILENAME, RTLD_NOW );
|
||||
CHECK_DLERROR( "dlopen", X509_SO_FILENAME );
|
||||
void *x509_so = dlopen(X509_SO_FILENAME, RTLD_NOW);
|
||||
CHECK_DLERROR("dlopen", X509_SO_FILENAME);
|
||||
const mbedtls_x509_crt_profile *profile =
|
||||
dlsym( x509_so, "mbedtls_x509_crt_profile_default" );
|
||||
CHECK_DLERROR( "dlsym", "mbedtls_x509_crt_profile_default" );
|
||||
mbedtls_printf( "dlopen(%s): Allowed md mask: %08x\n",
|
||||
X509_SO_FILENAME, (unsigned) profile->allowed_mds );
|
||||
dlclose( x509_so );
|
||||
CHECK_DLERROR( "dlclose", X509_SO_FILENAME );
|
||||
dlsym(x509_so, "mbedtls_x509_crt_profile_default");
|
||||
CHECK_DLERROR("dlsym", "mbedtls_x509_crt_profile_default");
|
||||
mbedtls_printf("dlopen(%s): Allowed md mask: %08x\n",
|
||||
X509_SO_FILENAME, (unsigned) profile->allowed_mds);
|
||||
dlclose(x509_so);
|
||||
CHECK_DLERROR("dlclose", X509_SO_FILENAME);
|
||||
#endif /* MBEDTLS_X509_CRT_PARSE_C */
|
||||
|
||||
#if defined(MBEDTLS_MD_C)
|
||||
void *crypto_so = dlopen( CRYPTO_SO_FILENAME, RTLD_NOW );
|
||||
CHECK_DLERROR( "dlopen", CRYPTO_SO_FILENAME );
|
||||
const int *( *md_list )( void ) =
|
||||
dlsym( crypto_so, "mbedtls_md_list" );
|
||||
CHECK_DLERROR( "dlsym", "mbedtls_md_list" );
|
||||
const int *mds = md_list( );
|
||||
for( n = 0; mds[n] != 0; n++ )
|
||||
/* nothing to do, we're just counting */;
|
||||
mbedtls_printf( "dlopen(%s): %u hashes\n",
|
||||
CRYPTO_SO_FILENAME, n );
|
||||
dlclose( crypto_so );
|
||||
CHECK_DLERROR( "dlclose", CRYPTO_SO_FILENAME );
|
||||
void *crypto_so = dlopen(CRYPTO_SO_FILENAME, RTLD_NOW);
|
||||
CHECK_DLERROR("dlopen", CRYPTO_SO_FILENAME);
|
||||
const int *(*md_list)(void) =
|
||||
dlsym(crypto_so, "mbedtls_md_list");
|
||||
CHECK_DLERROR("dlsym", "mbedtls_md_list");
|
||||
const int *mds = md_list();
|
||||
for (n = 0; mds[n] != 0; n++) {/* nothing to do, we're just counting */
|
||||
;
|
||||
}
|
||||
mbedtls_printf("dlopen(%s): %u hashes\n",
|
||||
CRYPTO_SO_FILENAME, n);
|
||||
dlclose(crypto_so);
|
||||
CHECK_DLERROR("dlclose", CRYPTO_SO_FILENAME);
|
||||
#endif /* MBEDTLS_MD_C */
|
||||
|
||||
return( 0 );
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,47 +36,43 @@
|
|||
#include <string.h>
|
||||
#include "query_config.h"
|
||||
|
||||
int main( int argc, char *argv[] )
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int i;
|
||||
|
||||
if ( argc == 1 || strcmp( argv[1], "-h" ) == 0 )
|
||||
{
|
||||
mbedtls_printf( USAGE, argv[0] );
|
||||
return( MBEDTLS_EXIT_FAILURE );
|
||||
if (argc == 1 || strcmp(argv[1], "-h") == 0) {
|
||||
mbedtls_printf(USAGE, argv[0]);
|
||||
return MBEDTLS_EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if( strcmp( argv[1], "-l" ) == 0 )
|
||||
{
|
||||
if (strcmp(argv[1], "-l") == 0) {
|
||||
list_config();
|
||||
return( 0 );
|
||||
return 0;
|
||||
}
|
||||
|
||||
if( strcmp( argv[1], "-all" ) == 0 )
|
||||
{
|
||||
for( i = 2; i < argc; i++ )
|
||||
{
|
||||
if( query_config( argv[i] ) != 0 )
|
||||
return( 1 );
|
||||
if (strcmp(argv[1], "-all") == 0) {
|
||||
for (i = 2; i < argc; i++) {
|
||||
if (query_config(argv[i]) != 0) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return( 0 );
|
||||
return 0;
|
||||
}
|
||||
|
||||
if( strcmp( argv[1], "-any" ) == 0 )
|
||||
{
|
||||
for( i = 2; i < argc; i++ )
|
||||
{
|
||||
if( query_config( argv[i] ) == 0 )
|
||||
return( 0 );
|
||||
if (strcmp(argv[1], "-any") == 0) {
|
||||
for (i = 2; i < argc; i++) {
|
||||
if (query_config(argv[i]) == 0) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return( 1 );
|
||||
return 1;
|
||||
}
|
||||
|
||||
for( i = 1; i < argc; i++ )
|
||||
{
|
||||
if( query_config( argv[i] ) != 0 )
|
||||
return( 1 );
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (query_config(argv[i]) != 0) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return( 0 );
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
* which is automatically generated by
|
||||
* `scripts/generate_query_config.pl`.
|
||||
*/
|
||||
int query_config( const char *config );
|
||||
int query_config(const char *config);
|
||||
|
||||
/** List all enabled configuration symbols
|
||||
*
|
||||
|
|
@ -41,6 +41,6 @@ int query_config( const char *config );
|
|||
* which is automatically generated by
|
||||
* `scripts/generate_query_config.pl`.
|
||||
*/
|
||||
void list_config( void );
|
||||
void list_config(void);
|
||||
|
||||
#endif /* MBEDTLS_PROGRAMS_TEST_QUERY_CONFIG_H */
|
||||
|
|
|
|||
|
|
@ -65,106 +65,101 @@
|
|||
/* Sanity check for malloc. This is not expected to fail, and is rather
|
||||
* intended to display potentially useful information about the platform,
|
||||
* in particular the behavior of malloc(0). */
|
||||
static int calloc_self_test( int verbose )
|
||||
static int calloc_self_test(int verbose)
|
||||
{
|
||||
int failures = 0;
|
||||
void *empty1 = mbedtls_calloc( 0, 1 );
|
||||
void *empty2 = mbedtls_calloc( 0, 1 );
|
||||
void *buffer1 = mbedtls_calloc( 1, 1 );
|
||||
void *buffer2 = mbedtls_calloc( 1, 1 );
|
||||
void *empty1 = mbedtls_calloc(0, 1);
|
||||
void *empty2 = mbedtls_calloc(0, 1);
|
||||
void *buffer1 = mbedtls_calloc(1, 1);
|
||||
void *buffer2 = mbedtls_calloc(1, 1);
|
||||
|
||||
if( empty1 == NULL && empty2 == NULL )
|
||||
{
|
||||
if( verbose )
|
||||
mbedtls_printf( " CALLOC(0): passed (NULL)\n" );
|
||||
}
|
||||
else if( empty1 == NULL || empty2 == NULL )
|
||||
{
|
||||
if( verbose )
|
||||
mbedtls_printf( " CALLOC(0): failed (mix of NULL and non-NULL)\n" );
|
||||
if (empty1 == NULL && empty2 == NULL) {
|
||||
if (verbose) {
|
||||
mbedtls_printf(" CALLOC(0): passed (NULL)\n");
|
||||
}
|
||||
} else if (empty1 == NULL || empty2 == NULL) {
|
||||
if (verbose) {
|
||||
mbedtls_printf(" CALLOC(0): failed (mix of NULL and non-NULL)\n");
|
||||
}
|
||||
++failures;
|
||||
}
|
||||
else if( empty1 == empty2 )
|
||||
{
|
||||
if( verbose )
|
||||
mbedtls_printf( " CALLOC(0): passed (same non-null)\n" );
|
||||
}
|
||||
else
|
||||
{
|
||||
if( verbose )
|
||||
mbedtls_printf( " CALLOC(0): passed (distinct non-null)\n" );
|
||||
} else if (empty1 == empty2) {
|
||||
if (verbose) {
|
||||
mbedtls_printf(" CALLOC(0): passed (same non-null)\n");
|
||||
}
|
||||
} else {
|
||||
if (verbose) {
|
||||
mbedtls_printf(" CALLOC(0): passed (distinct non-null)\n");
|
||||
}
|
||||
}
|
||||
|
||||
if( buffer1 == NULL || buffer2 == NULL )
|
||||
{
|
||||
if( verbose )
|
||||
mbedtls_printf( " CALLOC(1): failed (NULL)\n" );
|
||||
if (buffer1 == NULL || buffer2 == NULL) {
|
||||
if (verbose) {
|
||||
mbedtls_printf(" CALLOC(1): failed (NULL)\n");
|
||||
}
|
||||
++failures;
|
||||
}
|
||||
else if( buffer1 == buffer2 )
|
||||
{
|
||||
if( verbose )
|
||||
mbedtls_printf( " CALLOC(1): failed (same buffer twice)\n" );
|
||||
} else if (buffer1 == buffer2) {
|
||||
if (verbose) {
|
||||
mbedtls_printf(" CALLOC(1): failed (same buffer twice)\n");
|
||||
}
|
||||
++failures;
|
||||
}
|
||||
else
|
||||
{
|
||||
if( verbose )
|
||||
mbedtls_printf( " CALLOC(1): passed\n" );
|
||||
} else {
|
||||
if (verbose) {
|
||||
mbedtls_printf(" CALLOC(1): passed\n");
|
||||
}
|
||||
}
|
||||
|
||||
mbedtls_free( buffer1 );
|
||||
buffer1 = mbedtls_calloc( 1, 1 );
|
||||
if( buffer1 == NULL )
|
||||
{
|
||||
if( verbose )
|
||||
mbedtls_printf( " CALLOC(1 again): failed (NULL)\n" );
|
||||
mbedtls_free(buffer1);
|
||||
buffer1 = mbedtls_calloc(1, 1);
|
||||
if (buffer1 == NULL) {
|
||||
if (verbose) {
|
||||
mbedtls_printf(" CALLOC(1 again): failed (NULL)\n");
|
||||
}
|
||||
++failures;
|
||||
}
|
||||
else
|
||||
{
|
||||
if( verbose )
|
||||
mbedtls_printf( " CALLOC(1 again): passed\n" );
|
||||
} else {
|
||||
if (verbose) {
|
||||
mbedtls_printf(" CALLOC(1 again): passed\n");
|
||||
}
|
||||
}
|
||||
|
||||
if( verbose )
|
||||
mbedtls_printf( "\n" );
|
||||
mbedtls_free( empty1 );
|
||||
mbedtls_free( empty2 );
|
||||
mbedtls_free( buffer1 );
|
||||
mbedtls_free( buffer2 );
|
||||
return( failures );
|
||||
if (verbose) {
|
||||
mbedtls_printf("\n");
|
||||
}
|
||||
mbedtls_free(empty1);
|
||||
mbedtls_free(empty2);
|
||||
mbedtls_free(buffer1);
|
||||
mbedtls_free(buffer2);
|
||||
return failures;
|
||||
}
|
||||
#endif /* MBEDTLS_SELF_TEST */
|
||||
|
||||
static int test_snprintf( size_t n, const char *ref_buf, int ref_ret )
|
||||
static int test_snprintf(size_t n, const char *ref_buf, int ref_ret)
|
||||
{
|
||||
int ret;
|
||||
char buf[10] = "xxxxxxxxx";
|
||||
const char ref[10] = "xxxxxxxxx";
|
||||
|
||||
ret = mbedtls_snprintf( buf, n, "%s", "123" );
|
||||
if( ret < 0 || (size_t) ret >= n )
|
||||
ret = mbedtls_snprintf(buf, n, "%s", "123");
|
||||
if (ret < 0 || (size_t) ret >= n) {
|
||||
ret = -1;
|
||||
|
||||
if( strncmp( ref_buf, buf, sizeof( buf ) ) != 0 ||
|
||||
ref_ret != ret ||
|
||||
memcmp( buf + n, ref + n, sizeof( buf ) - n ) != 0 )
|
||||
{
|
||||
return( 1 );
|
||||
}
|
||||
|
||||
return( 0 );
|
||||
if (strncmp(ref_buf, buf, sizeof(buf)) != 0 ||
|
||||
ref_ret != ret ||
|
||||
memcmp(buf + n, ref + n, sizeof(buf) - n) != 0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int run_test_snprintf( void )
|
||||
static int run_test_snprintf(void)
|
||||
{
|
||||
return( test_snprintf( 0, "xxxxxxxxx", -1 ) != 0 ||
|
||||
test_snprintf( 1, "", -1 ) != 0 ||
|
||||
test_snprintf( 2, "1", -1 ) != 0 ||
|
||||
test_snprintf( 3, "12", -1 ) != 0 ||
|
||||
test_snprintf( 4, "123", 3 ) != 0 ||
|
||||
test_snprintf( 5, "123", 3 ) != 0 );
|
||||
return test_snprintf(0, "xxxxxxxxx", -1) != 0 ||
|
||||
test_snprintf(1, "", -1) != 0 ||
|
||||
test_snprintf(2, "1", -1) != 0 ||
|
||||
test_snprintf(3, "12", -1) != 0 ||
|
||||
test_snprintf(4, "123", 3) != 0 ||
|
||||
test_snprintf(5, "123", 3) != 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -174,7 +169,7 @@ static int run_test_snprintf( void )
|
|||
*/
|
||||
#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_ENTROPY_C)
|
||||
#if defined(MBEDTLS_ENTROPY_NV_SEED) && !defined(MBEDTLS_NO_PLATFORM_ENTROPY)
|
||||
static void create_entropy_seed_file( void )
|
||||
static void create_entropy_seed_file(void)
|
||||
{
|
||||
int result;
|
||||
size_t output_len = 0;
|
||||
|
|
@ -182,151 +177,152 @@ static void create_entropy_seed_file( void )
|
|||
|
||||
/* Attempt to read the entropy seed file. If this fails - attempt to write
|
||||
* to the file to ensure one is present. */
|
||||
result = mbedtls_platform_std_nv_seed_read( seed_value,
|
||||
MBEDTLS_ENTROPY_BLOCK_SIZE );
|
||||
if( 0 == result )
|
||||
result = mbedtls_platform_std_nv_seed_read(seed_value,
|
||||
MBEDTLS_ENTROPY_BLOCK_SIZE);
|
||||
if (0 == result) {
|
||||
return;
|
||||
}
|
||||
|
||||
result = mbedtls_platform_entropy_poll( NULL,
|
||||
seed_value,
|
||||
MBEDTLS_ENTROPY_BLOCK_SIZE,
|
||||
&output_len );
|
||||
if( 0 != result )
|
||||
result = mbedtls_platform_entropy_poll(NULL,
|
||||
seed_value,
|
||||
MBEDTLS_ENTROPY_BLOCK_SIZE,
|
||||
&output_len);
|
||||
if (0 != result) {
|
||||
return;
|
||||
}
|
||||
|
||||
if( MBEDTLS_ENTROPY_BLOCK_SIZE != output_len )
|
||||
if (MBEDTLS_ENTROPY_BLOCK_SIZE != output_len) {
|
||||
return;
|
||||
}
|
||||
|
||||
mbedtls_platform_std_nv_seed_write( seed_value, MBEDTLS_ENTROPY_BLOCK_SIZE );
|
||||
mbedtls_platform_std_nv_seed_write(seed_value, MBEDTLS_ENTROPY_BLOCK_SIZE);
|
||||
}
|
||||
#endif
|
||||
|
||||
int mbedtls_entropy_self_test_wrapper( int verbose )
|
||||
int mbedtls_entropy_self_test_wrapper(int verbose)
|
||||
{
|
||||
#if defined(MBEDTLS_ENTROPY_NV_SEED) && !defined(MBEDTLS_NO_PLATFORM_ENTROPY)
|
||||
create_entropy_seed_file( );
|
||||
create_entropy_seed_file();
|
||||
#endif
|
||||
return( mbedtls_entropy_self_test( verbose ) );
|
||||
return mbedtls_entropy_self_test(verbose);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(MBEDTLS_SELF_TEST)
|
||||
#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
|
||||
int mbedtls_memory_buffer_alloc_free_and_self_test( int verbose )
|
||||
int mbedtls_memory_buffer_alloc_free_and_self_test(int verbose)
|
||||
{
|
||||
if( verbose != 0 )
|
||||
{
|
||||
if (verbose != 0) {
|
||||
#if defined(MBEDTLS_MEMORY_DEBUG)
|
||||
mbedtls_memory_buffer_alloc_status( );
|
||||
mbedtls_memory_buffer_alloc_status();
|
||||
#endif
|
||||
}
|
||||
mbedtls_memory_buffer_alloc_free( );
|
||||
return( mbedtls_memory_buffer_alloc_self_test( verbose ) );
|
||||
mbedtls_memory_buffer_alloc_free();
|
||||
return mbedtls_memory_buffer_alloc_self_test(verbose);
|
||||
}
|
||||
#endif
|
||||
|
||||
typedef struct
|
||||
{
|
||||
typedef struct {
|
||||
const char *name;
|
||||
int ( *function )( int );
|
||||
int (*function)(int);
|
||||
} selftest_t;
|
||||
|
||||
const selftest_t selftests[] =
|
||||
{
|
||||
{"calloc", calloc_self_test},
|
||||
{ "calloc", calloc_self_test },
|
||||
#if defined(MBEDTLS_MD5_C)
|
||||
{"md5", mbedtls_md5_self_test},
|
||||
{ "md5", mbedtls_md5_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_RIPEMD160_C)
|
||||
{"ripemd160", mbedtls_ripemd160_self_test},
|
||||
{ "ripemd160", mbedtls_ripemd160_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_SHA1_C)
|
||||
{"sha1", mbedtls_sha1_self_test},
|
||||
{ "sha1", mbedtls_sha1_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_SHA224_C)
|
||||
{"sha224", mbedtls_sha224_self_test},
|
||||
{ "sha224", mbedtls_sha224_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_SHA256_C)
|
||||
{"sha256", mbedtls_sha256_self_test},
|
||||
{ "sha256", mbedtls_sha256_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_SHA384_C)
|
||||
{"sha384", mbedtls_sha384_self_test},
|
||||
{ "sha384", mbedtls_sha384_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_SHA512_C)
|
||||
{"sha512", mbedtls_sha512_self_test},
|
||||
{ "sha512", mbedtls_sha512_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_DES_C)
|
||||
{"des", mbedtls_des_self_test},
|
||||
{ "des", mbedtls_des_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_AES_C)
|
||||
{"aes", mbedtls_aes_self_test},
|
||||
{ "aes", mbedtls_aes_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_GCM_C) && defined(MBEDTLS_AES_C)
|
||||
{"gcm", mbedtls_gcm_self_test},
|
||||
{ "gcm", mbedtls_gcm_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_CCM_C) && defined(MBEDTLS_AES_C)
|
||||
{"ccm", mbedtls_ccm_self_test},
|
||||
{ "ccm", mbedtls_ccm_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_NIST_KW_C) && defined(MBEDTLS_AES_C)
|
||||
{"nist_kw", mbedtls_nist_kw_self_test},
|
||||
{ "nist_kw", mbedtls_nist_kw_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_CMAC_C)
|
||||
{"cmac", mbedtls_cmac_self_test},
|
||||
{ "cmac", mbedtls_cmac_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_CHACHA20_C)
|
||||
{"chacha20", mbedtls_chacha20_self_test},
|
||||
{ "chacha20", mbedtls_chacha20_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_POLY1305_C)
|
||||
{"poly1305", mbedtls_poly1305_self_test},
|
||||
{ "poly1305", mbedtls_poly1305_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_CHACHAPOLY_C)
|
||||
{"chacha20-poly1305", mbedtls_chachapoly_self_test},
|
||||
{ "chacha20-poly1305", mbedtls_chachapoly_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_BASE64_C)
|
||||
{"base64", mbedtls_base64_self_test},
|
||||
{ "base64", mbedtls_base64_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_BIGNUM_C)
|
||||
{"mpi", mbedtls_mpi_self_test},
|
||||
{ "mpi", mbedtls_mpi_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_RSA_C)
|
||||
{"rsa", mbedtls_rsa_self_test},
|
||||
{ "rsa", mbedtls_rsa_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_CAMELLIA_C)
|
||||
{"camellia", mbedtls_camellia_self_test},
|
||||
{ "camellia", mbedtls_camellia_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_ARIA_C)
|
||||
{"aria", mbedtls_aria_self_test},
|
||||
{ "aria", mbedtls_aria_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_CTR_DRBG_C)
|
||||
{"ctr_drbg", mbedtls_ctr_drbg_self_test},
|
||||
{ "ctr_drbg", mbedtls_ctr_drbg_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_HMAC_DRBG_C)
|
||||
{"hmac_drbg", mbedtls_hmac_drbg_self_test},
|
||||
{ "hmac_drbg", mbedtls_hmac_drbg_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_ECP_C)
|
||||
{"ecp", mbedtls_ecp_self_test},
|
||||
{ "ecp", mbedtls_ecp_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_ECJPAKE_C)
|
||||
{"ecjpake", mbedtls_ecjpake_self_test},
|
||||
{ "ecjpake", mbedtls_ecjpake_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_DHM_C)
|
||||
{"dhm", mbedtls_dhm_self_test},
|
||||
{ "dhm", mbedtls_dhm_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_ENTROPY_C)
|
||||
{"entropy", mbedtls_entropy_self_test_wrapper},
|
||||
{ "entropy", mbedtls_entropy_self_test_wrapper },
|
||||
#endif
|
||||
#if defined(MBEDTLS_PKCS5_C)
|
||||
{"pkcs5", mbedtls_pkcs5_self_test},
|
||||
{ "pkcs5", mbedtls_pkcs5_self_test },
|
||||
#endif
|
||||
/* Heap test comes last */
|
||||
#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
|
||||
{"memory_buffer_alloc", mbedtls_memory_buffer_alloc_free_and_self_test},
|
||||
{ "memory_buffer_alloc", mbedtls_memory_buffer_alloc_free_and_self_test },
|
||||
#endif
|
||||
{NULL, NULL}
|
||||
{ NULL, NULL }
|
||||
};
|
||||
#endif /* MBEDTLS_SELF_TEST */
|
||||
|
||||
int main( int argc, char *argv[] )
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
#if defined(MBEDTLS_SELF_TEST)
|
||||
const selftest_t *test;
|
||||
|
|
@ -345,11 +341,10 @@ int main( int argc, char *argv[] )
|
|||
* of a NULL pointer. We do however use that in our code for initializing
|
||||
* structures, which should work on every modern platform. Let's be sure.
|
||||
*/
|
||||
memset( &pointer, 0, sizeof( void * ) );
|
||||
if( pointer != NULL )
|
||||
{
|
||||
mbedtls_printf( "all-bits-zero is not a NULL pointer\n" );
|
||||
mbedtls_exit( MBEDTLS_EXIT_FAILURE );
|
||||
memset(&pointer, 0, sizeof(void *));
|
||||
if (pointer != NULL) {
|
||||
mbedtls_printf("all-bits-zero is not a NULL pointer\n");
|
||||
mbedtls_exit(MBEDTLS_EXIT_FAILURE);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -374,52 +369,52 @@ int main( int argc, char *argv[] )
|
|||
#define CHECK_PADDING_SIGNED(TYPE, NAME) \
|
||||
do \
|
||||
{ \
|
||||
if( sizeof( TYPE ) == 2 || sizeof( TYPE ) == 4 || \
|
||||
sizeof( TYPE ) == 8 ) { \
|
||||
if( ( sizeof( TYPE ) == 2 && \
|
||||
(int16_t) NAME ## _MAX != 0x7FFF ) || \
|
||||
( sizeof( TYPE ) == 4 && \
|
||||
(int32_t) NAME ## _MAX != 0x7FFFFFFF ) || \
|
||||
( sizeof( TYPE ) == 8 && \
|
||||
(int64_t) NAME ## _MAX != 0x7FFFFFFFFFFFFFFF ) ) \
|
||||
if (sizeof(TYPE) == 2 || sizeof(TYPE) == 4 || \
|
||||
sizeof(TYPE) == 8) { \
|
||||
if ((sizeof(TYPE) == 2 && \
|
||||
(int16_t) NAME ## _MAX != 0x7FFF) || \
|
||||
(sizeof(TYPE) == 4 && \
|
||||
(int32_t) NAME ## _MAX != 0x7FFFFFFF) || \
|
||||
(sizeof(TYPE) == 8 && \
|
||||
(int64_t) NAME ## _MAX != 0x7FFFFFFFFFFFFFFF)) \
|
||||
{ \
|
||||
mbedtls_printf( "Type '" #TYPE "' has padding bits\n" );\
|
||||
mbedtls_exit( MBEDTLS_EXIT_FAILURE ); \
|
||||
mbedtls_printf("Type '" #TYPE "' has padding bits\n"); \
|
||||
mbedtls_exit(MBEDTLS_EXIT_FAILURE); \
|
||||
} \
|
||||
} else { \
|
||||
mbedtls_printf( "Padding checks only implemented for types of size 2, 4 or 8" \
|
||||
" - cannot check type '" #TYPE "' of size %" MBEDTLS_PRINTF_SIZET "\n", \
|
||||
sizeof( TYPE ) ); \
|
||||
mbedtls_exit( MBEDTLS_EXIT_FAILURE ); \
|
||||
mbedtls_printf("Padding checks only implemented for types of size 2, 4 or 8" \
|
||||
" - cannot check type '" #TYPE "' of size %" MBEDTLS_PRINTF_SIZET "\n", \
|
||||
sizeof(TYPE)); \
|
||||
mbedtls_exit(MBEDTLS_EXIT_FAILURE); \
|
||||
} \
|
||||
} while( 0 )
|
||||
} while (0)
|
||||
|
||||
#define CHECK_PADDING_UNSIGNED(TYPE, NAME) \
|
||||
do \
|
||||
{ \
|
||||
if( ( sizeof( TYPE ) == 2 && \
|
||||
(uint16_t) NAME ## _MAX != 0xFFFF ) || \
|
||||
( sizeof( TYPE ) == 4 && \
|
||||
(uint32_t) NAME ## _MAX != 0xFFFFFFFF ) || \
|
||||
( sizeof( TYPE ) == 8 && \
|
||||
(uint64_t) NAME ## _MAX != 0xFFFFFFFFFFFFFFFF ) ) \
|
||||
if ((sizeof(TYPE) == 2 && \
|
||||
(uint16_t) NAME ## _MAX != 0xFFFF) || \
|
||||
(sizeof(TYPE) == 4 && \
|
||||
(uint32_t) NAME ## _MAX != 0xFFFFFFFF) || \
|
||||
(sizeof(TYPE) == 8 && \
|
||||
(uint64_t) NAME ## _MAX != 0xFFFFFFFFFFFFFFFF)) \
|
||||
{ \
|
||||
mbedtls_printf( "Type '" #TYPE "' has padding bits\n" ); \
|
||||
mbedtls_exit( MBEDTLS_EXIT_FAILURE ); \
|
||||
mbedtls_printf("Type '" #TYPE "' has padding bits\n"); \
|
||||
mbedtls_exit(MBEDTLS_EXIT_FAILURE); \
|
||||
} \
|
||||
} while( 0 )
|
||||
} while (0)
|
||||
|
||||
CHECK_PADDING_SIGNED( short, SHRT );
|
||||
CHECK_PADDING_SIGNED( int, INT );
|
||||
CHECK_PADDING_SIGNED( long, LONG );
|
||||
CHECK_PADDING_SIGNED( long long, LLONG );
|
||||
CHECK_PADDING_SIGNED( ptrdiff_t, PTRDIFF );
|
||||
CHECK_PADDING_SIGNED(short, SHRT);
|
||||
CHECK_PADDING_SIGNED(int, INT);
|
||||
CHECK_PADDING_SIGNED(long, LONG);
|
||||
CHECK_PADDING_SIGNED(long long, LLONG);
|
||||
CHECK_PADDING_SIGNED(ptrdiff_t, PTRDIFF);
|
||||
|
||||
CHECK_PADDING_UNSIGNED( unsigned short, USHRT );
|
||||
CHECK_PADDING_UNSIGNED( unsigned, UINT );
|
||||
CHECK_PADDING_UNSIGNED( unsigned long, ULONG );
|
||||
CHECK_PADDING_UNSIGNED( unsigned long long, ULLONG );
|
||||
CHECK_PADDING_UNSIGNED( size_t, SIZE );
|
||||
CHECK_PADDING_UNSIGNED(unsigned short, USHRT);
|
||||
CHECK_PADDING_UNSIGNED(unsigned, UINT);
|
||||
CHECK_PADDING_UNSIGNED(unsigned long, ULONG);
|
||||
CHECK_PADDING_UNSIGNED(unsigned long long, ULLONG);
|
||||
CHECK_PADDING_UNSIGNED(size_t, SIZE);
|
||||
|
||||
#undef CHECK_PADDING_SIGNED
|
||||
#undef CHECK_PADDING_UNSIGNED
|
||||
|
|
@ -427,83 +422,68 @@ int main( int argc, char *argv[] )
|
|||
/*
|
||||
* Make sure we have a snprintf that correctly zero-terminates
|
||||
*/
|
||||
if( run_test_snprintf() != 0 )
|
||||
{
|
||||
mbedtls_printf( "the snprintf implementation is broken\n" );
|
||||
mbedtls_exit( MBEDTLS_EXIT_FAILURE );
|
||||
if (run_test_snprintf() != 0) {
|
||||
mbedtls_printf("the snprintf implementation is broken\n");
|
||||
mbedtls_exit(MBEDTLS_EXIT_FAILURE);
|
||||
}
|
||||
|
||||
for( argp = argv + ( argc >= 1 ? 1 : argc ); *argp != NULL; ++argp )
|
||||
{
|
||||
if( strcmp( *argp, "--quiet" ) == 0 ||
|
||||
strcmp( *argp, "-q" ) == 0 )
|
||||
{
|
||||
for (argp = argv + (argc >= 1 ? 1 : argc); *argp != NULL; ++argp) {
|
||||
if (strcmp(*argp, "--quiet") == 0 ||
|
||||
strcmp(*argp, "-q") == 0) {
|
||||
v = 0;
|
||||
}
|
||||
else if( strcmp( *argp, "--exclude" ) == 0 ||
|
||||
strcmp( *argp, "-x" ) == 0 )
|
||||
{
|
||||
} else if (strcmp(*argp, "--exclude") == 0 ||
|
||||
strcmp(*argp, "-x") == 0) {
|
||||
exclude_mode = 1;
|
||||
}
|
||||
else
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if( v != 0 )
|
||||
mbedtls_printf( "\n" );
|
||||
if (v != 0) {
|
||||
mbedtls_printf("\n");
|
||||
}
|
||||
|
||||
#if defined(MBEDTLS_SELF_TEST)
|
||||
|
||||
#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
|
||||
mbedtls_memory_buffer_alloc_init( buf, sizeof(buf) );
|
||||
mbedtls_memory_buffer_alloc_init(buf, sizeof(buf));
|
||||
#endif
|
||||
|
||||
if( *argp != NULL && exclude_mode == 0 )
|
||||
{
|
||||
if (*argp != NULL && exclude_mode == 0) {
|
||||
/* Run the specified tests */
|
||||
for( ; *argp != NULL; argp++ )
|
||||
{
|
||||
for( test = selftests; test->name != NULL; test++ )
|
||||
{
|
||||
if( !strcmp( *argp, test->name ) )
|
||||
{
|
||||
if( test->function( v ) != 0 )
|
||||
{
|
||||
for (; *argp != NULL; argp++) {
|
||||
for (test = selftests; test->name != NULL; test++) {
|
||||
if (!strcmp(*argp, test->name)) {
|
||||
if (test->function(v) != 0) {
|
||||
suites_failed++;
|
||||
}
|
||||
suites_tested++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if( test->name == NULL )
|
||||
{
|
||||
mbedtls_printf( " Test suite %s not available -> failed\n\n", *argp );
|
||||
if (test->name == NULL) {
|
||||
mbedtls_printf(" Test suite %s not available -> failed\n\n", *argp);
|
||||
suites_failed++;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
/* Run all the tests except excluded ones */
|
||||
for( test = selftests; test->name != NULL; test++ )
|
||||
{
|
||||
if( exclude_mode )
|
||||
{
|
||||
for (test = selftests; test->name != NULL; test++) {
|
||||
if (exclude_mode) {
|
||||
char **excluded;
|
||||
for( excluded = argp; *excluded != NULL; ++excluded )
|
||||
{
|
||||
if( !strcmp( *excluded, test->name ) )
|
||||
for (excluded = argp; *excluded != NULL; ++excluded) {
|
||||
if (!strcmp(*excluded, test->name)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if( *excluded )
|
||||
{
|
||||
if( v )
|
||||
mbedtls_printf( " Skip: %s\n", test->name );
|
||||
if (*excluded) {
|
||||
if (v) {
|
||||
mbedtls_printf(" Skip: %s\n", test->name);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if( test->function( v ) != 0 )
|
||||
{
|
||||
if (test->function(v) != 0) {
|
||||
suites_failed++;
|
||||
}
|
||||
suites_tested++;
|
||||
|
|
@ -512,25 +492,22 @@ int main( int argc, char *argv[] )
|
|||
|
||||
#else
|
||||
(void) exclude_mode;
|
||||
mbedtls_printf( " MBEDTLS_SELF_TEST not defined.\n" );
|
||||
mbedtls_printf(" MBEDTLS_SELF_TEST not defined.\n");
|
||||
#endif
|
||||
|
||||
if( v != 0 )
|
||||
{
|
||||
mbedtls_printf( " Executed %d test suites\n\n", suites_tested );
|
||||
if (v != 0) {
|
||||
mbedtls_printf(" Executed %d test suites\n\n", suites_tested);
|
||||
|
||||
if( suites_failed > 0)
|
||||
{
|
||||
mbedtls_printf( " [ %d tests FAIL ]\n\n", suites_failed );
|
||||
}
|
||||
else
|
||||
{
|
||||
mbedtls_printf( " [ All tests PASS ]\n\n" );
|
||||
if (suites_failed > 0) {
|
||||
mbedtls_printf(" [ %d tests FAIL ]\n\n", suites_failed);
|
||||
} else {
|
||||
mbedtls_printf(" [ All tests PASS ]\n\n");
|
||||
}
|
||||
}
|
||||
|
||||
if( suites_failed > 0)
|
||||
mbedtls_exit( MBEDTLS_EXIT_FAILURE );
|
||||
if (suites_failed > 0) {
|
||||
mbedtls_exit(MBEDTLS_EXIT_FAILURE);
|
||||
}
|
||||
|
||||
mbedtls_exit( MBEDTLS_EXIT_SUCCESS );
|
||||
mbedtls_exit(MBEDTLS_EXIT_SUCCESS);
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -35,16 +35,16 @@
|
|||
|
||||
#define BUFFER_LEN 1024
|
||||
|
||||
void usage( void )
|
||||
void usage(void)
|
||||
{
|
||||
mbedtls_printf( "Zeroize is a simple program to assist with testing\n" );
|
||||
mbedtls_printf( "the mbedtls_platform_zeroize() function by using the\n" );
|
||||
mbedtls_printf( "debugger. This program takes a file as input and\n" );
|
||||
mbedtls_printf( "prints the first %d characters. Usage:\n\n", BUFFER_LEN );
|
||||
mbedtls_printf( " zeroize <FILE>\n" );
|
||||
mbedtls_printf("Zeroize is a simple program to assist with testing\n");
|
||||
mbedtls_printf("the mbedtls_platform_zeroize() function by using the\n");
|
||||
mbedtls_printf("debugger. This program takes a file as input and\n");
|
||||
mbedtls_printf("prints the first %d characters. Usage:\n\n", BUFFER_LEN);
|
||||
mbedtls_printf(" zeroize <FILE>\n");
|
||||
}
|
||||
|
||||
int main( int argc, char** argv )
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int exit_code = MBEDTLS_EXIT_FAILURE;
|
||||
FILE *fp;
|
||||
|
|
@ -53,34 +53,32 @@ int main( int argc, char** argv )
|
|||
char *end = p + BUFFER_LEN;
|
||||
int c;
|
||||
|
||||
if( argc != 2 )
|
||||
{
|
||||
mbedtls_printf( "This program takes exactly 1 argument\n" );
|
||||
if (argc != 2) {
|
||||
mbedtls_printf("This program takes exactly 1 argument\n");
|
||||
usage();
|
||||
mbedtls_exit( exit_code );
|
||||
mbedtls_exit(exit_code);
|
||||
}
|
||||
|
||||
fp = fopen( argv[1], "r" );
|
||||
if( fp == NULL )
|
||||
{
|
||||
mbedtls_printf( "Could not open file '%s'\n", argv[1] );
|
||||
mbedtls_exit( exit_code );
|
||||
fp = fopen(argv[1], "r");
|
||||
if (fp == NULL) {
|
||||
mbedtls_printf("Could not open file '%s'\n", argv[1]);
|
||||
mbedtls_exit(exit_code);
|
||||
}
|
||||
|
||||
while( ( c = fgetc( fp ) ) != EOF && p < end - 1 )
|
||||
*p++ = (char)c;
|
||||
while ((c = fgetc(fp)) != EOF && p < end - 1) {
|
||||
*p++ = (char) c;
|
||||
}
|
||||
*p = '\0';
|
||||
|
||||
if( p - buf != 0 )
|
||||
{
|
||||
mbedtls_printf( "%s\n", buf );
|
||||
if (p - buf != 0) {
|
||||
mbedtls_printf("%s\n", buf);
|
||||
exit_code = MBEDTLS_EXIT_SUCCESS;
|
||||
} else {
|
||||
mbedtls_printf("The file is empty!\n");
|
||||
}
|
||||
else
|
||||
mbedtls_printf( "The file is empty!\n" );
|
||||
|
||||
fclose( fp );
|
||||
mbedtls_platform_zeroize( buf, sizeof( buf ) );
|
||||
fclose(fp);
|
||||
mbedtls_platform_zeroize(buf, sizeof(buf));
|
||||
|
||||
mbedtls_exit( exit_code ); // GDB_BREAK_HERE -- don't remove this comment!
|
||||
mbedtls_exit(exit_code); // GDB_BREAK_HERE -- don't remove this comment!
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue