yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-25 21:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #441 - crypt and hash gcm (#546)

Browse source 
* Fix crypt_and_hash to support decrypting GCM encrypted files

* Fix documentation in crypt_and_hash for the generic case

* Remove unused lastn from crypt_and_hash

lastn is not used with the cipher layer as it already provides padding
and understanding of length of the original data.

Backport of fix by Paul Bakker.
This commit is contained in:
Simon Butcher 2016-09-03 12:39:38 +01:00
parent 255e5f7a02
commit d2ad47c7fd
1 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
programs/aes/crypt_and_hash.c
View file

@ -2,7 +2,7 @@
* \brief Generic file encryption program using generic wrappers for configured * \brief Generic file encryption program using generic wrappers for configured
* security. * security.
* *
* Copyright (C) 2006-2011, ARM Limited, All Rights Reserved * Copyright (C) 2006-2016, ARM Limited, All Rights Reserved
* *
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of mbed TLS (https://tls.mbed.org)
* *
@ -75,7 +75,7 @@ int main( void )
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
int ret = 1, i, n; int ret = 1, i, n;
int mode, lastn; int mode;
size_t keylen, ilen, olen; size_t keylen, ilen, olen;
FILE *fkey, *fin = NULL, *fout = NULL; FILE *fkey, *fin = NULL, *fout = NULL;
@ -260,7 +260,7 @@ int main( int argc, char *argv[] )
{ {
/* /*
* Generate the initialization vector as: * Generate the initialization vector as:
* IV = SHA-256( filesize || filename )[0..15] * IV = MD( filesize || filename )[0..15]
*/ */
for( i = 0; i < 8; i++ ) for( i = 0; i < 8; i++ )
buffer[i] = (unsigned char)( filesize >> ( i << 3 ) ); buffer[i] = (unsigned char)( filesize >> ( i << 3 ) );
@ -274,15 +274,6 @@ int main( int argc, char *argv[] )
memcpy( IV, digest, 16 ); memcpy( IV, digest, 16 );
/*
* The last four bits in the IV are actually used
* to store the file size modulo the AES block size.
*/
lastn = (int)( filesize & 0x0F );
IV[15] = (unsigned char)
( ( IV[15] & 0xF0 ) | lastn );
/* /*
* Append the IV at the beginning of the output. * Append the IV at the beginning of the output.
*/ */
@ -389,10 +380,10 @@ int main( int argc, char *argv[] )
* The encrypted file must be structured as follows: * The encrypted file must be structured as follows:
* *
* 00 .. 15 Initialization Vector * 00 .. 15 Initialization Vector
* 16 .. 31 AES Encrypted Block #1 * 16 .. 31 Encrypted Block #1
* .. * ..
* N*16 .. (N+1)*16 - 1 AES Encrypted Block #N * N*16 .. (N+1)*16 - 1 Encrypted Block #N
* (N+1)*16 .. (N+1)*16 + 32 HMAC-SHA-256(ciphertext) * (N+1)*16 .. (N+1)*16 + n Hash(ciphertext)
*/ */
if( filesize < 16 + md_get_size( md_info ) ) if( filesize < 16 + md_get_size( md_info ) )
{ {
@ -400,7 +391,11 @@ int main( int argc, char *argv[] )
goto exit; goto exit;
} }
if( ( ( filesize - md_get_size( md_info ) ) % /*
* Check the file size.
*/
if( cipher_info->mode != POLARSSL_MODE_GCM &&
( ( filesize - md_get_size( md_info ) ) %
cipher_get_block_size( &cipher_ctx ) ) != 0 ) cipher_get_block_size( &cipher_ctx ) ) != 0 )
{ {
polarssl_fprintf( stderr, "File content not a multiple of the block size (%d).\n", polarssl_fprintf( stderr, "File content not a multiple of the block size (%d).\n",
@ -423,7 +418,6 @@ int main( int argc, char *argv[] )
} }
memcpy( IV, buffer, 16 ); memcpy( IV, buffer, 16 );
lastn = IV[15] & 0x0F;
/* /*
* Hash the IV and the secret key together 8192 times * Hash the IV and the secret key together 8192 times
@ -466,20 +460,30 @@ int main( int argc, char *argv[] )
/* /*
* Decrypt and write the plaintext. * Decrypt and write the plaintext.
*/ */
for( offset = 0; offset < filesize; offset += cipher_get_block_size( &cipher_ctx ) ) for( offset = 0;
offset < filesize;
offset += cipher_get_block_size( &cipher_ctx ) )
{ {
if( fread( buffer, 1, cipher_get_block_size( &cipher_ctx ), fin ) != if( (unsigned int) filesize - offset >
(size_t) cipher_get_block_size( &cipher_ctx ) ) cipher_get_block_size( &cipher_ctx ) )
{
ilen = cipher_get_block_size( &cipher_ctx );
}
else
{
ilen = (unsigned int) ( filesize - offset );
}
if( fread( buffer, 1, ilen, fin ) != ilen )
{ {
polarssl_fprintf( stderr, "fread(%d bytes) failed\n", polarssl_fprintf( stderr, "fread(%d bytes) failed\n",
cipher_get_block_size( &cipher_ctx ) ); cipher_get_block_size( &cipher_ctx ) );
goto exit; goto exit;
} }
md_hmac_update( &md_ctx, buffer, cipher_get_block_size( &cipher_ctx ) ); md_hmac_update( &md_ctx, buffer, ilen );
if( cipher_update( &cipher_ctx, buffer, if( cipher_update( &cipher_ctx, buffer, ilen, output,
cipher_get_block_size( &cipher_ctx ), &olen ) != 0 )
output, &olen ) != 0 )
{ {
polarssl_fprintf( stderr, "cipher_update() returned error\n" ); polarssl_fprintf( stderr, "cipher_update() returned error\n" );
goto exit; goto exit;