Suyu/mbedtls
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/mbedtls.git synced 2025-12-23 15:55:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fixed cipher interface for encrypt/decrypt functions

Browse source
This commit is contained in:
Paul Bakker 2010-03-18 21:21:02 +00:00
parent 4fc45522f1
commit f3ccc68100
21 changed files with 286 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

27
library/aes.c
View file

@ -647,7 +647,7 @@ int aes_setkey_dec( aes_context *ctx, const unsigned char *key, int keysize )
/*
* AES-ECB block encryption/decryption
*/
void aes_crypt_ecb( aes_context *ctx,
int aes_crypt_ecb( aes_context *ctx,
int mode,
const unsigned char input[16],
unsigned char output[16] )
@ -659,7 +659,11 @@ void aes_crypt_ecb( aes_context *ctx,
if( padlock_supports( PADLOCK_ACE ) )
{
if( padlock_xcryptecb( ctx, mode, input, output ) == 0 )
return;
return( 0 );
// If padlock data misaligned, we just fall back to
// unaccelerated mode
//
}
#endif
@ -743,12 +747,14 @@ void aes_crypt_ecb( aes_context *ctx,
PUT_ULONG_LE( X1, output, 4 );
PUT_ULONG_LE( X2, output, 8 );
PUT_ULONG_LE( X3, output, 12 );
return( 0 );
}
/*
* AES-CBC buffer encryption/decryption
*/
void aes_crypt_cbc( aes_context *ctx,
int aes_crypt_cbc( aes_context *ctx,
int mode,
int length,
unsigned char iv[16],
@ -758,11 +764,18 @@ void aes_crypt_cbc( aes_context *ctx,
int i;
unsigned char temp[16];
if( length % 16 )
return( POLARSSL_ERR_AES_INVALID_INPUT_LENGTH );
#if defined(POLARSSL_PADLOCK_C) && defined(POLARSSL_HAVE_X86)
if( padlock_supports( PADLOCK_ACE ) )
{
if( padlock_xcryptcbc( ctx, mode, length, iv, input, output ) == 0 )
return;
return( 0 );
// If padlock data misaligned, we just fall back to
// unaccelerated mode
//
}
#endif
@ -798,12 +811,14 @@ void aes_crypt_cbc( aes_context *ctx,
length -= 16;
}
}
return( 0 );
}
/*
* AES-CFB128 buffer encryption/decryption
*/
void aes_crypt_cfb128( aes_context *ctx,
int aes_crypt_cfb128( aes_context *ctx,
int mode,
int length,
int *iv_off,
@ -841,6 +856,8 @@ void aes_crypt_cfb128( aes_context *ctx,
}
*iv_off = n;
return( 0 );
}
#if defined(POLARSSL_SELF_TEST)