mirrors-yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls synced 2024-11-25 01:28:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix whitespace at EOL issues

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-10-30 09:23:19 +01:00
parent 03dde85c3b
commit e670f90e48
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/x509_crt.c
View file

@ -2014,9 +2014,9 @@ static int x509_crt_verify_child(
unsigned char hash[MBEDTLS_MD_MAX_SIZE]; unsigned char hash[MBEDTLS_MD_MAX_SIZE];
mbedtls_x509_crt *grandparent; mbedtls_x509_crt *grandparent;
const mbedtls_md_info_t *md_info; const mbedtls_md_info_t *md_info;
/* Counting intermediate self signed certificates */ /* Counting intermediate self signed certificates */
if( ( path_cnt != 0 ) && x509_name_cmp( &child->issuer, &child->subject ) == 0 ) if( ( path_cnt != 0 ) && x509_name_cmp( &child->issuer, &child->subject ) == 0 )
self_cnt++; self_cnt++;
/* path_cnt is 0 for the first intermediate CA */ /* path_cnt is 0 for the first intermediate CA */
@ -2092,7 +2092,7 @@ static int x509_crt_verify_child(
{ {
/* +2 because the current step is not yet accounted for /* +2 because the current step is not yet accounted for
* and because max_pathlen is one higher than it should be. * and because max_pathlen is one higher than it should be.
* Also self signed certificates do not count to the limit. */ * Also self signed certificates do not count to the limit. */
if( grandparent->max_pathlen > 0 && if( grandparent->max_pathlen > 0 &&
grandparent->max_pathlen < 2 + path_cnt - self_cnt ) grandparent->max_pathlen < 2 + path_cnt - self_cnt )
{ {
@ -2243,7 +2243,7 @@ int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
for( parent = crt->next; parent != NULL; parent = parent->next ) for( parent = crt->next; parent != NULL; parent = parent->next )
{ {
/* +2 because the current step is not yet accounted for /* +2 because the current step is not yet accounted for
* and because max_pathlen is one higher than it should be */ * and because max_pathlen is one higher than it should be */
if( parent->max_pathlen > 0 && if( parent->max_pathlen > 0 &&
parent->max_pathlen < 2 + pathlen ) parent->max_pathlen < 2 + pathlen )
{ {

2
tests/suites/helpers.function
View file

@ -212,7 +212,7 @@ typedef struct
* This function returns random based on a buffer it receives. * This function returns random based on a buffer it receives.
* *
* rng_state shall be a pointer to a rnd_buf_info structure. * rng_state shall be a pointer to a rnd_buf_info structure.
* *
* The number of bytes released from the buffer on each call to * The number of bytes released from the buffer on each call to
* the random function is specified by per_call. (Can be between * the random function is specified by per_call. (Can be between
* 1 and 4) * 1 and 4)

4
tests/suites/test_suite_mpi.function
View file

@ -89,7 +89,7 @@ void mbedtls_mpi_write_binary( int radix_X, char *input_X, char *input_A,
mbedtls_mpi_init( &X ); mbedtls_mpi_init( &X );
TEST_ASSERT( mbedtls_mpi_read_string( &X, radix_X, input_X ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &X, radix_X, input_X ) == 0 );
buflen = mbedtls_mpi_size( &X ); buflen = mbedtls_mpi_size( &X );
if( buflen > (size_t) output_size ) if( buflen > (size_t) output_size )
buflen = (size_t) output_size; buflen = (size_t) output_size;
@ -542,7 +542,7 @@ void mbedtls_mpi_sub_abs( int radix_X, char *input_X, int radix_Y, char *input_Y
TEST_ASSERT( mbedtls_mpi_read_string( &X, radix_X, input_X ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &X, radix_X, input_X ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &Y, radix_Y, input_Y ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &Y, radix_Y, input_Y ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &A, radix_A, input_A ) == 0 ); TEST_ASSERT( mbedtls_mpi_read_string( &A, radix_A, input_A ) == 0 );
res = mbedtls_mpi_sub_abs( &Z, &X, &Y ); res = mbedtls_mpi_sub_abs( &Z, &X, &Y );
TEST_ASSERT( res == sub_result ); TEST_ASSERT( res == sub_result );
if( res == 0 ) if( res == 0 )

2
tests/suites/test_suite_x509parse.data
View file

@ -788,7 +788,7 @@ X509 Certificate ASN1 (TBSCertificate, valid version tag, invalid length)
x509parse_crt:"30163014a012021000000000000000000000000000000000":"":MBEDTLS_ERR_X509_INVALID_VERSION + MBEDTLS_ERR_ASN1_INVALID_LENGTH x509parse_crt:"30163014a012021000000000000000000000000000000000":"":MBEDTLS_ERR_X509_INVALID_VERSION + MBEDTLS_ERR_ASN1_INVALID_LENGTH
X509 Certificate ASN1 (TBSCertificate, valid version tag, no serial) X509 Certificate ASN1 (TBSCertificate, valid version tag, no serial)
x509parse_crt:"30073005a003020104":"":MBEDTLS_ERR_X509_INVALID_SERIAL + MBEDTLS_ERR_ASN1_OUT_OF_DATA x509parse_crt:"30073005a003020104":"":MBEDTLS_ERR_X509_INVALID_SERIAL + MBEDTLS_ERR_ASN1_OUT_OF_DATA
X509 Certificate ASN1 (TBSCertificate, invalid length version tag) X509 Certificate ASN1 (TBSCertificate, invalid length version tag)
x509parse_crt:"30083006a00402010400":"":MBEDTLS_ERR_X509_INVALID_VERSION + MBEDTLS_ERR_ASN1_LENGTH_MISMATCH x509parse_crt:"30083006a00402010400":"":MBEDTLS_ERR_X509_INVALID_VERSION + MBEDTLS_ERR_ASN1_LENGTH_MISMATCH

8
tests/suites/test_suite_x509parse.function
View file

@ -433,16 +433,16 @@ void mbedtls_x509_crt_verify_chain( char *chain_paths, char *trusted_ca, int fl
char* act; char* act;
uint32_t flags; uint32_t flags;
int result, res; int result, res;
mbedtls_x509_crt trusted, chain; mbedtls_x509_crt trusted, chain;
result= flags_result?MBEDTLS_ERR_X509_CERT_VERIFY_FAILED:0; result= flags_result?MBEDTLS_ERR_X509_CERT_VERIFY_FAILED:0;
mbedtls_x509_crt_init( &chain ); mbedtls_x509_crt_init( &chain );
mbedtls_x509_crt_init( &trusted ); mbedtls_x509_crt_init( &trusted );
while( (act = strsep( &chain_paths, " " )) ) while( (act = strsep( &chain_paths, " " )) )
TEST_ASSERT( mbedtls_x509_crt_parse_file( &chain, act ) == 0 ); TEST_ASSERT( mbedtls_x509_crt_parse_file( &chain, act ) == 0 );
TEST_ASSERT( mbedtls_x509_crt_parse_file( &trusted, trusted_ca ) == 0 ); TEST_ASSERT( mbedtls_x509_crt_parse_file( &trusted, trusted_ca ) == 0 );
res = mbedtls_x509_crt_verify( &chain, &trusted, NULL, NULL, &flags, NULL, NULL ); res = mbedtls_x509_crt_verify( &chain, &trusted, NULL, NULL, &flags, NULL, NULL );