mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-29 12:32:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5294 from paul-elliott-arm/ssl_context_info_prog

Browse Source 
Two fixes for SSL context info sample program
This commit is contained in:
Gilles Peskine 2021-12-09 23:22:58 +01:00 committed by GitHub
commit f40145887d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
programs/ssl/ssl_context_info.c
View File

@ -20,6 +20,7 @@
#define MBEDTLS_ALLOW_PRIVATE_ACCESS
#include "mbedtls/build_info.h"
#include "mbedtls/debug.h"
#include <stdio.h>
#include <stdlib.h>
@ -161,6 +162,7 @@ void printf_dbg( const char *str, ... )
}
}
MBEDTLS_PRINTF_ATTRIBUTE( 1, 2 )
void printf_err( const char *str, ... )
{
va_list args;
@ -219,7 +221,13 @@ void parse_arguments( int argc, char *argv[] )
error_exit();
}
if( ( b64_file = fopen( argv[i], "r" ) ) == NULL )
if( NULL != b64_file )
{
printf_err( "Cannot specify more than one file with -f\n" );
error_exit( );
}
if( ( b64_file = fopen( argv[i], "r" )) == NULL )
{
printf_err( "Cannot find file \"%s\"\n", argv[i] );
error_exit();
@ -461,7 +469,8 @@ size_t read_next_b64_code( uint8_t **b64, size_t *max_len )
}
else if( len > *max_len )
{
printf_err( "The code found is too large by %u bytes.\n", len - *max_len );
printf_err( "The code found is too large by %" MBEDTLS_PRINTF_SIZET " bytes.\n",
len - *max_len );
len = pad = 0;
}
else if( len % 4 != 0 )