Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Fix bugs in programs displaying verify flags

Conflicts:
	programs/test/ssl_cert_test.c
	programs/x509/cert_app.c
This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-24 14:10:04 +02:00
commit 7cfbaf05b3
2 changed files with 2 additions and 2 deletions

View file

@ -181,7 +181,7 @@ int main( void )
}
else
{
mbedtls_printf( " failed\n ! mbedtls_x509_crt_verify returned %d\n\n", ret );
mbedtls_printf( " failed\n ! mbedtls_x509_crt_verify returned %d\n\n", flags );
goto exit;
}
}

View file

@ -346,7 +346,7 @@ int main( int argc, char *argv[] )
mbedtls_printf( " failed\n" );
mbedtls_x509_crt_verify_info( vrfy_buf, sizeof( vrfy_buf ), " ! ", ret );
mbedtls_x509_crt_verify_info( vrfy_buf, sizeof( vrfy_buf ), " ! ", flags );
mbedtls_printf( "%s\n", vrfy_buf );
}