mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-18 05:42:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Fixed dual use of n

Browse Source
This commit is contained in:
Paul Bakker 2011-05-26 14:02:58 +00:00
parent 5690efccc4
commit 25b5fe5ac6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/aes/crypt_and_hash.c
View File

@ -64,9 +64,9 @@ int main( void )
#else #else
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
int ret = 1, i; int ret = 1, i, n;
int mode, lastn; int mode, lastn;
size_t keylen, olen, n; size_t keylen, ilen, olen;
FILE *fkey, *fin = NULL, *fout = NULL; FILE *fkey, *fin = NULL, *fout = NULL;
char *p; char *p;
@ -300,16 +300,16 @@ int main( int argc, char *argv[] )
*/ */
for( offset = 0; offset < filesize; offset += cipher_get_block_size( &cipher_ctx ) ) for( offset = 0; offset < filesize; offset += cipher_get_block_size( &cipher_ctx ) )
{ {
n = ( (unsigned int) filesize - offset > cipher_get_block_size( &cipher_ctx ) ) ? ilen = ( (unsigned int) filesize - offset > cipher_get_block_size( &cipher_ctx ) ) ?
cipher_get_block_size( &cipher_ctx ) : (unsigned int) ( filesize - offset ); cipher_get_block_size( &cipher_ctx ) : (unsigned int) ( filesize - offset );
if( fread( buffer, 1, n, fin ) != n ) if( fread( buffer, 1, ilen, fin ) != ilen )
{ {
fprintf( stderr, "fread(%ld bytes) failed\n", (long) n ); fprintf( stderr, "fread(%ld bytes) failed\n", (long) n );
goto exit; goto exit;
} }
cipher_update( &cipher_ctx, buffer, n, output, &olen ); cipher_update( &cipher_ctx, buffer, ilen, output, &olen );
md_hmac_update( &md_ctx, output, olen ); md_hmac_update( &md_ctx, output, olen );
if( fwrite( output, 1, olen, fout ) != olen ) if( fwrite( output, 1, olen, fout ) != olen )
@ -324,7 +324,7 @@ int main( int argc, char *argv[] )
if( fwrite( output, 1, olen, fout ) != olen ) if( fwrite( output, 1, olen, fout ) != olen )
{ {
fprintf( stderr, "fwrite(%d bytes) failed\n", n ); fprintf( stderr, "fwrite(%ld bytes) failed\n", (long) olen );
goto exit; goto exit;
} }
/* /*