eden-emu/mbedtls
17
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use fewer bits for iv_size

Browse source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-06-24 11:30:45 +01:00
parent bb521fdbc9
commit 0ffb68ee3f
2 changed files with 89 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/mbedtls/cipher.h
View file

@ -296,7 +296,7 @@ typedef struct mbedtls_cipher_info_t {
* For ciphers that accept variable IV sizes,
* this is the recommended size.
*/
uint16_t MBEDTLS_PRIVATE(iv_size);
uint8_t MBEDTLS_PRIVATE(iv_size) : 3;
/** Bitflag comprised of MBEDTLS_CIPHER_VARIABLE_IV_LEN and
* MBEDTLS_CIPHER_VARIABLE_KEY_LEN indicating whether the
@ -309,8 +309,10 @@ typedef struct mbedtls_cipher_info_t {
} mbedtls_cipher_info_t;
/* This is used to more compactly represent the key_bitlen field above. It is for internal use only. */
/* For internal use only.
* These are used to more compactly represent the key_bitlen and iv_size fields above. */
#define MBEDTLS_KEY_BITLEN_SHIFT 6
#define MBEDTLS_IV_SIZE_SHIFT 2
/**
* Generic cipher context.
@ -524,7 +526,7 @@ static inline size_t mbedtls_cipher_info_get_iv_size(
return 0;
}
return (size_t) info->MBEDTLS_PRIVATE(iv_size);
return ((size_t) info->MBEDTLS_PRIVATE(iv_size)) << MBEDTLS_IV_SIZE_SHIFT;
}
/**
@ -730,7 +732,7 @@ static inline int mbedtls_cipher_get_iv_size(
return (int) ctx->MBEDTLS_PRIVATE(iv_size);
}
return (int) ctx->MBEDTLS_PRIVATE(cipher_info)->MBEDTLS_PRIVATE(iv_size);
return (int) (((int)ctx->MBEDTLS_PRIVATE(cipher_info)->MBEDTLS_PRIVATE(iv_size)) << MBEDTLS_IV_SIZE_SHIFT);
}
/**