yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-10-18 13:11:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up location of init and free for some programs to prevent memory

Browse source 
leaks on incorrect arguments
This commit is contained in:
Paul Bakker 2014-04-17 16:02:36 +02:00
parent cbe3d0d5cc
commit 0c22610693
19 changed files with 95 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
programs/hash/md5sum.c
View file

@ -132,6 +132,8 @@ static int md5_check( char *filename )
n = sizeof( line );
}
fclose( f );
if( nb_err1 != 0 )
{
printf( "WARNING: %d (out of %d) input files could "

2
programs/hash/sha1sum.c
View file

@ -132,6 +132,8 @@ static int sha1_check( char *filename )
n = sizeof( line );
}
fclose( f );
if( nb_err1 != 0 )
{
printf( "WARNING: %d (out of %d) input files could "

2
programs/hash/sha2sum.c
View file

@ -132,6 +132,8 @@ static int sha256_check( char *filename )
n = sizeof( line );
}
fclose( f );
if( nb_err1 != 0 )
{
printf( "WARNING: %d (out of %d) input files could "

4
programs/pkey/dh_client.c
View file

@ -272,7 +272,9 @@ int main( int argc, char *argv[] )
exit:
net_close( server_fd );
if( server_fd != -1 )
net_close( server_fd );
rsa_free( &rsa );
dhm_free( &dhm );
entropy_free( &entropy );

2
programs/pkey/dh_genprime.c
View file

@ -65,6 +65,7 @@ int main( int argc, char *argv[] )
((void) argv);
mpi_init( &G ); mpi_init( &P ); mpi_init( &Q );
entropy_init( &entropy );
if( ( ret = mpi_read_string( &G, 10, GENERATOR ) ) != 0 )
{
@ -84,7 +85,6 @@ int main( int argc, char *argv[] )
printf( "\n . Seeding the random number generator..." );
fflush( stdout );
entropy_init( &entropy );
if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
(const unsigned char *) pers,
strlen( pers ) ) ) != 0 )

4
programs/pkey/dh_server.c
View file

@ -273,7 +273,9 @@ int main( int argc, char *argv[] )
exit:
net_close( client_fd );
if( client_fd != -1 )
net_close( client_fd );
rsa_free( &rsa );
dhm_free( &dhm );
entropy_free( &entropy );

5
programs/pkey/gen_key.c
View file

@ -146,9 +146,12 @@ static int write_private_key( pk_context *key, const char *output_file )
return( -1 );
if( fwrite( c, 1, len, f ) != len )
{
fclose( f );
return( -1 );
}
fclose(f);
fclose( f );
return( 0 );
}

10
programs/pkey/key_app_writer.c
View file

@ -104,9 +104,12 @@ static int write_public_key( pk_context *key, const char *output_file )
return( -1 );
if( fwrite( c, 1, len, f ) != len )
{
fclose( f );
return( -1 );
}
fclose(f);
fclose( f );
return( 0 );
}
@ -140,9 +143,12 @@ static int write_private_key( pk_context *key, const char *output_file )
return( -1 );
if( fwrite( c, 1, len, f ) != len )
{
fclose( f );
return( -1 );
}
fclose(f);
fclose( f );
return( 0 );
}

8
programs/pkey/pk_sign.c
View file

@ -58,7 +58,7 @@ int main( int argc, char *argv[] )
int main( int argc, char *argv[] )
{
FILE *f;
int ret;
int ret = 1;
pk_context pk;
entropy_context entropy;
ctr_drbg_context ctr_drbg;
@ -68,7 +68,8 @@ int main( int argc, char *argv[] )
const char *pers = "pk_sign";
size_t olen = 0;
ret = 1;
entropy_init( &entropy );
pk_init( &pk );
if( argc != 3 )
{
@ -84,7 +85,6 @@ int main( int argc, char *argv[] )
printf( "\n . Seeding the random number generator..." );
fflush( stdout );
entropy_init( &entropy );
if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
(const unsigned char *) pers,
strlen( pers ) ) ) != 0 )
@ -96,8 +96,6 @@ int main( int argc, char *argv[] )
printf( "\n . Reading private key from '%s'", argv[1] );
fflush( stdout );
pk_init( &pk );
if( ( ret = pk_parse_keyfile( &pk, argv[1], "" ) ) != 0 )
{
ret = 1;

7
programs/pkey/pk_verify.c
View file

@ -54,14 +54,15 @@ int main( int argc, char *argv[] )
int main( int argc, char *argv[] )
{
FILE *f;
int ret;
int ret = 1;
size_t i;
pk_context pk;
unsigned char hash[20];
unsigned char buf[POLARSSL_MPI_MAX_SIZE];
char filename[512];
ret = 1;
pk_init( &pk );
if( argc != 3 )
{
printf( "usage: pk_verify <key_file> <filename>\n" );
@ -76,8 +77,6 @@ int main( int argc, char *argv[] )
printf( "\n . Reading public key from '%s'", argv[1] );
fflush( stdout );
pk_init( &pk );
if( ( ret = pk_parse_public_keyfile( &pk, argv[1] ) ) != 0 )
{
printf( " failed\n ! pk_parse_public_keyfile returned -0x%04x\n", -ret );

8
programs/pkey/rsa_sign_pss.c
View file

@ -58,7 +58,7 @@ int main( int argc, char *argv[] )
int main( int argc, char *argv[] )
{
FILE *f;
int ret;
int ret = 1;
pk_context pk;
entropy_context entropy;
ctr_drbg_context ctr_drbg;
@ -68,7 +68,8 @@ int main( int argc, char *argv[] )
const char *pers = "rsa_sign_pss";
size_t olen = 0;
ret = 1;
entropy_init( &entropy );
pk_init( &pk );
if( argc != 3 )
{
@ -84,7 +85,6 @@ int main( int argc, char *argv[] )
printf( "\n . Seeding the random number generator..." );
fflush( stdout );
entropy_init( &entropy );
if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
(const unsigned char *) pers,
strlen( pers ) ) ) != 0 )
@ -96,8 +96,6 @@ int main( int argc, char *argv[] )
printf( "\n . Reading private key from '%s'", argv[1] );
fflush( stdout );
pk_init( &pk );
if( ( ret = pk_parse_keyfile( &pk, argv[1], "" ) ) != 0 )
{
ret = 1;

7
programs/pkey/rsa_verify_pss.c
View file

@ -55,14 +55,15 @@ int main( int argc, char *argv[] )
int main( int argc, char *argv[] )
{
FILE *f;
int ret;
int ret = 1;
size_t i;
pk_context pk;
unsigned char hash[20];
unsigned char buf[POLARSSL_MPI_MAX_SIZE];
char filename[512];
ret = 1;
pk_init( &pk );
if( argc != 3 )
{
printf( "usage: rsa_verify_pss <key_file> <filename>\n" );
@ -77,8 +78,6 @@ int main( int argc, char *argv[] )
printf( "\n . Reading public key from '%s'", argv[1] );
fflush( stdout );
pk_init( &pk );
if( ( ret = pk_parse_public_keyfile( &pk, argv[1] ) ) != 0 )
{
printf( " failed\n ! Could not read key from '%s'\n", argv[1] );

4
programs/ssl/ssl_client1.c
View file

@ -277,8 +277,10 @@ exit:
}
#endif
if( server_fd != -1 )
net_close( server_fd );
x509_crt_free( &cacert );
net_close( server_fd );
ssl_free( &ssl );
entropy_free( &entropy );

16
programs/ssl/ssl_fork_server.c
View file

@ -108,6 +108,12 @@ int main( int argc, char *argv[] )
((void) argc);
((void) argv);
memset( &ssl, 0, sizeof(ssl_context) );
entropy_init( &entropy );
pk_init( &pkey );
x509_crt_init( &srvcert );
signal( SIGCHLD, SIG_IGN );
/*
@ -116,7 +122,6 @@ int main( int argc, char *argv[] )
printf( "\n . Initial seeding of the random generator..." );
fflush( stdout );
entropy_init( &entropy );
if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
(const unsigned char *) pers,
strlen( pers ) ) ) != 0 )
@ -133,8 +138,6 @@ int main( int argc, char *argv[] )
printf( " . Loading the server cert. and key..." );
fflush( stdout );
x509_crt_init( &srvcert );
/*
* This demonstration program uses embedded test certificates.
* Instead, you may want to use x509_crt_parse_file() to read the
@ -156,7 +159,6 @@ int main( int argc, char *argv[] )
goto exit;
}
pk_init( &pkey );
ret = pk_parse_key( &pkey, (const unsigned char *) test_srv_key,
strlen( test_srv_key ), NULL, 0 );
if( ret != 0 )
@ -246,7 +248,7 @@ int main( int argc, char *argv[] )
printf( " failed\n ! ctr_drbg_reseed returned %d\n", ret );
goto exit;
}
if( ( ret = ssl_init( &ssl ) ) != 0 )
{
printf( " failed\n ! ssl_init returned %d\n\n", ret );
@ -360,7 +362,9 @@ int main( int argc, char *argv[] )
exit:
net_close( client_fd );
if( client_fd != -1 )
net_close( client_fd );
x509_crt_free( &srvcert );
pk_free( &pkey );
ssl_free( &ssl );

12
programs/ssl/ssl_server.c
View file

@ -100,9 +100,13 @@ int main( int argc, char *argv[] )
((void) argc);
((void) argv);
memset( &ssl, 0, sizeof(ssl_context) );
#if defined(POLARSSL_SSL_CACHE_C)
ssl_cache_init( &cache );
#endif
x509_crt_init( &srvcert );
pk_init( &pkey );
entropy_init( &entropy );
/*
* 1. Load the certificates and private RSA key
@ -110,8 +114,6 @@ int main( int argc, char *argv[] )
printf( "\n . Loading the server cert. and key..." );
fflush( stdout );
x509_crt_init( &srvcert );
/*
* This demonstration program uses embedded test certificates.
* Instead, you may want to use x509_crt_parse_file() to read the
@ -133,7 +135,6 @@ int main( int argc, char *argv[] )
goto exit;
}
pk_init( &pkey );
ret = pk_parse_key( &pkey, (const unsigned char *) test_srv_key,
strlen( test_srv_key ), NULL, 0 );
if( ret != 0 )
@ -164,7 +165,6 @@ int main( int argc, char *argv[] )
printf( " . Seeding the random number generator..." );
fflush( stdout );
entropy_init( &entropy );
if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
(const unsigned char *) pers,
strlen( pers ) ) ) != 0 )
@ -352,7 +352,9 @@ exit:
}
#endif
net_close( client_fd );
if( client_fd != -1 )
net_close( client_fd );
x509_crt_free( &srvcert );
pk_free( &pkey );
ssl_free( &ssl );

28
programs/ssl/ssl_server2.c
View file

@ -339,30 +339,44 @@ sni_entry *sni_parse( char *sni_string )
if( ( new->cert = polarssl_malloc( sizeof( x509_crt ) ) ) == NULL ||
( new->key = polarssl_malloc( sizeof( pk_context ) ) ) == NULL )
return( NULL );
{
cur = NULL;
goto exit;
}
x509_crt_init( new->cert );
pk_init( new->key );
new->name = p;
while( *p != ',' ) if( ++p > end ) return( NULL );
while( *p != ',' ) if( ++p > end ) { cur = NULL; goto exit; }
*p++ = '\0';
crt_file = p;
while( *p != ',' ) if( ++p > end ) return( NULL );
while( *p != ',' ) if( ++p > end ) { cur = NULL; goto exit; }
*p++ = '\0';
key_file = p;
while( *p != ',' ) if( ++p > end ) return( NULL );
while( *p != ',' ) if( ++p > end ) { cur = NULL; goto exit; }
*p++ = '\0';
if( x509_crt_parse_file( new->cert, crt_file ) != 0 ||
pk_parse_keyfile( new->key, key_file, "" ) != 0 )
return( NULL );
{
cur = NULL;
goto exit;
}
new->next = cur;
cur = new;
new = NULL;
}
exit:
if( new != NULL )
{
x509_crt_free( new->cert);
pk_free( new->key );
polarssl_free( new );
}
return( cur );
@ -1345,7 +1359,9 @@ exit:
}
#endif
net_close( client_fd );
if( client_fd != -1 )
net_close( client_fd );
#if defined(POLARSSL_X509_CRT_PARSE_C)
x509_crt_free( &cacert );
x509_crt_free( &srvcert );

12
programs/test/ssl_test.c
View file

@ -167,7 +167,11 @@ static int ssl_test( struct options *opt )
ret = 1;
memset( &ssl, 0, sizeof(ssl_context) );
entropy_init( &entropy );
x509_crt_init( &srvcert );
pk_init( &pkey );
if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
(const unsigned char *) pers,
strlen( pers ) ) ) != 0 )
@ -183,8 +187,6 @@ static int ssl_test( struct options *opt )
memset( read_state, 0, sizeof( read_state ) );
memset( write_state, 0, sizeof( write_state ) );
x509_crt_init( &srvcert );
pk_init( &pkey );
if( opt->opmode == OPMODE_CLIENT )
{
@ -198,7 +200,7 @@ static int ssl_test( struct options *opt )
if( ( ret = ssl_init( &ssl ) ) != 0 )
{
printf( " ! ssl_init returned %d\n\n", ret );
return( ret );
goto exit;
}
ssl_set_endpoint( &ssl, SSL_IS_CLIENT );
@ -408,7 +410,9 @@ exit:
pk_free( &pkey );
ssl_free( &ssl );
entropy_free( &entropy );
net_close( client_fd );
if( client_fd != -1 )
net_close( client_fd );
return( ret );
}

5
programs/x509/cert_req.c
View file

@ -89,9 +89,12 @@ int write_certificate_request( x509write_csr *req, const char *output_file,
return( -1 );
if( fwrite( output_buf, 1, len, f ) != len )
{
fclose( f );
return( -1 );
}
fclose(f);
fclose( f );
return( 0 );
}

5
programs/x509/cert_write.c
View file

@ -113,9 +113,12 @@ int write_certificate( x509write_cert *crt, const char *output_file,
return( -1 );
if( fwrite( output_buf, 1, len, f ) != len )
{
fclose( f );
return( -1 );
}
fclose(f);
fclose( f );
return( 0 );
}