Merge pull request #51 from Patater/update-dev-tls-dev-crypto-merge

Merge mbedtls/development-psa, mbedtls/development into development
This commit is contained in:
Jaeden Amero 2019-02-15 15:07:37 +00:00 committed by GitHub
commit 0574e6a7bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
211 changed files with 12081 additions and 2477 deletions

View file

@ -5,7 +5,10 @@
#include "mbedtls/platform.h"
#else
#include <stdio.h>
#include <stdlib.h>
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
#define mbedtls_printf printf
#define mbedtls_exit exit
#endif
#define ASSERT( predicate ) \
@ -324,6 +327,18 @@ static void cipher_examples( void )
mbedtls_printf( "\tsuccess!\r\n" );
}
#if defined(MBEDTLS_CHECK_PARAMS)
#include "mbedtls/platform_util.h"
void mbedtls_param_failed( const char *failure_condition,
const char *file,
int line )
{
mbedtls_printf( "%s:%i: Input param failed - %s\n",
file, line, failure_condition );
mbedtls_exit( MBEDTLS_EXIT_FAILURE );
}
#endif
int main( void )
{
ASSERT( psa_crypto_init( ) == PSA_SUCCESS );

View file

@ -66,6 +66,7 @@
#define mbedtls_calloc calloc
#define mbedtls_free free
#define mbedtls_printf printf
#define mbedtls_exit exit
#endif
#include <stdio.h>
#include <string.h>
@ -618,6 +619,18 @@ static void usage( void )
mbedtls_printf( " and the same sequence of labels.\n" );
}
#if defined(MBEDTLS_CHECK_PARAMS)
#include "mbedtls/platform_util.h"
void mbedtls_param_failed( const char *failure_condition,
const char *file,
int line )
{
mbedtls_printf( "%s:%i: Input param failed - %s\n",
file, line, failure_condition );
mbedtls_exit( MBEDTLS_EXIT_FAILURE );
}
#endif
int main( int argc, char *argv[] )
{
const char *key_file_name = "master.key";