1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00

- Fixed cipher interface for encrypt/decrypt functions

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

View File

@ -458,7 +458,7 @@ int camellia_setkey_dec( camellia_context *ctx, const unsigned char *key, int ke
/*
* Camellia-ECB block encryption/decryption
*/
void camellia_crypt_ecb( camellia_context *ctx,
int camellia_crypt_ecb( camellia_context *ctx,
int mode,
const unsigned char input[16],
unsigned char output[16] )
@ -513,12 +513,14 @@ void camellia_crypt_ecb( camellia_context *ctx,
PUT_ULONG_BE( X[3], output, 4 );
PUT_ULONG_BE( X[0], output, 8 );
PUT_ULONG_BE( X[1], output, 12 );
return( 0 );
}
/*
* Camellia-CBC buffer encryption/decryption
*/
void camellia_crypt_cbc( camellia_context *ctx,
int camellia_crypt_cbc( camellia_context *ctx,
int mode,
int length,
unsigned char iv[16],
@ -528,6 +530,9 @@ void camellia_crypt_cbc( camellia_context *ctx,
int i;
unsigned char temp[16];
if( length % 16 )
return( POLARSSL_ERR_CAMELLIA_INVALID_INPUT_LENGTH );
if( mode == CAMELLIA_DECRYPT )
{
while( length > 0 )
@ -560,12 +565,14 @@ void camellia_crypt_cbc( camellia_context *ctx,
length -= 16;
}
}
return( 0 );
}
/*
* Camellia-CFB128 buffer encryption/decryption
*/
void camellia_crypt_cfb128( camellia_context *ctx,
int camellia_crypt_cfb128( camellia_context *ctx,
int mode,
int length,
int *iv_off,
@ -603,6 +610,8 @@ void camellia_crypt_cfb128( camellia_context *ctx,
}
*iv_off = n;
return( 0 );
}
#if defined(POLARSSL_SELF_TEST)