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

Merge remote-tracking branch 'psa/psa-wrapper-apis-march-12' into feature-psa

Browse source
This commit is contained in:
Gilles Peskine 2018-06-08 18:40:39 +02:00 • committed by itayzafrir
commit 3aa8efb230
5 changed files with 885 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
include/psa/crypto.h
View file

@ -322,6 +322,10 @@ typedef uint32_t psa_algorithm_t;
#define PSA_ALG_CTR ((psa_algorithm_t)0x04800001)
#define PSA_ALG_ARC4 ((psa_algorithm_t)0x04800002)
#define PSA_ALG_IS_STREAM_CIPHER(alg) \
(((alg) & (PSA_ALG_CATEGORY_MASK | PSA_ALG_CIPHER_SUBCATEGORY_MASK)) == \
PSA_ALG_STREAM_CIPHER)
#define PSA_ALG_CCM ((psa_algorithm_t)0x06000001)
#define PSA_ALG_GCM ((psa_algorithm_t)0x06000002)
@ -1060,12 +1064,15 @@ psa_status_t psa_encrypt_set_iv(psa_cipher_operation_t *operation,
psa_status_t psa_cipher_update(psa_cipher_operation_t *operation,
const uint8_t *input,
size_t input_length);
size_t input_length,
unsigned char *output,
size_t output_size,
size_t *output_length);
psa_status_t psa_cipher_finish(psa_cipher_operation_t *operation,
uint8_t *mac,
size_t mac_size,
size_t *mac_length);
uint8_t *output,
size_t output_size,
size_t *output_length);
psa_status_t psa_cipher_abort(psa_cipher_operation_t *operation);

3
include/psa/crypto_struct.h
View file

@ -101,12 +101,13 @@ struct psa_cipher_operation_s
{
psa_algorithm_t alg;
int key_set : 1;
int iv_required : 1;
int iv_set : 1;
uint8_t iv_size;
uint8_t block_size;
union
{
unsigned dummy; /* Make the union non-empty even with no supported algorithms. */
mbedtls_cipher_context_t cipher;
} ctx;
};