From 00131446be32d830d92f9d40b5cb949940e00160 Mon Sep 17 00:00:00 2001 From: Simon Butcher Date: Tue, 22 May 2018 22:40:36 +0100 Subject: [PATCH] Fix style and formatting for OFB feature --- include/mbedtls/cipher_internal.h | 1 - library/aes.c | 10 +++++----- tests/suites/test_suite_aes.function | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/mbedtls/cipher_internal.h b/include/mbedtls/cipher_internal.h index e761a9ea2..e02b7f113 100644 --- a/include/mbedtls/cipher_internal.h +++ b/include/mbedtls/cipher_internal.h @@ -59,7 +59,6 @@ struct mbedtls_cipher_base_t #if defined(MBEDTLS_CIPHER_MODE_CFB) /** Encrypt using CFB (Full length) */ - 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 *output ); diff --git a/library/aes.c b/library/aes.c index 267944a95..c221613b0 100644 --- a/library/aes.c +++ b/library/aes.c @@ -1068,11 +1068,11 @@ int mbedtls_aes_crypt_cfb8( mbedtls_aes_context *ctx, * AES-OFB (Output Feedback Mode) buffer encryption/decryption */ int mbedtls_aes_crypt_ofb( mbedtls_aes_context *ctx, - size_t length, - size_t *iv_off, - unsigned char iv[16], - const unsigned char *input, - unsigned char *output ) + size_t length, + size_t *iv_off, + unsigned char iv[16], + const unsigned char *input, + unsigned char *output ) { int ret = 0; size_t n = *iv_off; diff --git a/tests/suites/test_suite_aes.function b/tests/suites/test_suite_aes.function index c45a9ed6f..9d25666e0 100644 --- a/tests/suites/test_suite_aes.function +++ b/tests/suites/test_suite_aes.function @@ -291,8 +291,8 @@ exit: /* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_OFB */ void aes_encrypt_ofb( int fragment_size, char *hex_key_string, - char *hex_iv_string, char *hex_src_string, - char *hex_dst_string ) + char *hex_iv_string, char *hex_src_string, + char *hex_dst_string ) { unsigned char key_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 ); TEST_ASSERT( strncmp( (char *) dst_str, hex_dst_string, - ( 2 * fragment_size) ) == 0 ); + ( 2 * fragment_size ) ) == 0 ); in_buffer_len -= fragment_size; hex_dst_string += ( fragment_size * 2 );