AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix style and formatting for OFB feature

Browse Source
This commit is contained in:
Simon Butcher 2018-05-22 22:40:36 +01:00
parent 374bcd4255
commit 00131446be
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mbedtls/cipher_internal.h
View File

@ -59,7 +59,6 @@ struct mbedtls_cipher_base_t
#if defined(MBEDTLS_CIPHER_MODE_CFB) #if defined(MBEDTLS_CIPHER_MODE_CFB)
/** Encrypt using CFB (Full length) */ /** Encrypt using CFB (Full length) */
int (*cfb_func)( void *ctx, mbedtls_operation_t mode, size_t length, size_t *iv_off, int (*cfb_func)( void *ctx, mbedtls_operation_t mode, size_t length, size_t *iv_off,
unsigned char *iv, const unsigned char *input, unsigned char *iv, const unsigned char *input,
unsigned char *output ); unsigned char *output );

10
library/aes.c
View File

@ -1068,11 +1068,11 @@ int mbedtls_aes_crypt_cfb8( mbedtls_aes_context *ctx,
* AES-OFB (Output Feedback Mode) buffer encryption/decryption * AES-OFB (Output Feedback Mode) buffer encryption/decryption
*/ */
int mbedtls_aes_crypt_ofb( mbedtls_aes_context *ctx, int mbedtls_aes_crypt_ofb( mbedtls_aes_context *ctx,
size_t length, size_t length,
size_t *iv_off, size_t *iv_off,
unsigned char iv[16], unsigned char iv[16],
const unsigned char *input, const unsigned char *input,
unsigned char *output ) unsigned char *output )
{ {
int ret = 0; int ret = 0;
size_t n = *iv_off; size_t n = *iv_off;

6
tests/suites/test_suite_aes.function
View File

@ -291,8 +291,8 @@ exit:
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_OFB */ /* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_OFB */
void aes_encrypt_ofb( int fragment_size, char *hex_key_string, void aes_encrypt_ofb( int fragment_size, char *hex_key_string,
char *hex_iv_string, char *hex_src_string, char *hex_iv_string, char *hex_src_string,
char *hex_dst_string ) char *hex_dst_string )
{ {
unsigned char key_str[100]; unsigned char key_str[100];
unsigned char iv_str[100]; unsigned char iv_str[100];
@ -326,7 +326,7 @@ void aes_encrypt_ofb( int fragment_size, char *hex_key_string,
hexify( dst_str, output, fragment_size ); hexify( dst_str, output, fragment_size );
TEST_ASSERT( strncmp( (char *) dst_str, hex_dst_string, TEST_ASSERT( strncmp( (char *) dst_str, hex_dst_string,
( 2 * fragment_size) ) == 0 ); ( 2 * fragment_size ) ) == 0 );
in_buffer_len -= fragment_size; in_buffer_len -= fragment_size;
hex_dst_string += ( fragment_size * 2 ); hex_dst_string += ( fragment_size * 2 );