From 61cd5fd6718113049e508a32b682a60606436ba0 Mon Sep 17 00:00:00 2001 From: Krzysztof Jackiewicz Date: Fri, 1 Jul 2016 15:44:57 +0200 Subject: [PATCH] Update GCM/CCM examples Use nonstandard tag. Fix formatting. Add missing cleanup. Change-Id: Iec6f358ff3d05ae17ab072a72ef95401c777eb5a --- examples/encrypt_aes_gcm_ccm.c | 6 +++--- examples/seal.c | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/encrypt_aes_gcm_ccm.c b/examples/encrypt_aes_gcm_ccm.c index 7ac3534..c990d79 100644 --- a/examples/encrypt_aes_gcm_ccm.c +++ b/examples/encrypt_aes_gcm_ccm.c @@ -113,7 +113,7 @@ void encrypt_decrypt_aes_gcm(void) /* Set the tag length and get the tag after final encryption */ if (yaca_context_set_property(ctx, YACA_PROPERTY_GCM_TAG_LEN, - (void*)&tag_len, sizeof(tag_len)) != YACA_ERROR_NONE) + (void*)&tag_len, sizeof(tag_len)) != YACA_ERROR_NONE) goto exit; if (yaca_context_get_property(ctx, YACA_PROPERTY_GCM_TAG, (void**)tag, &tag_len) != YACA_ERROR_NONE) @@ -195,7 +195,7 @@ void encrypt_decrypt_aes_ccm(void) char *aad = NULL; char *tag = NULL; size_t aad_len = 16; - size_t tag_len = 12; + size_t tag_len = 14; size_t block_len; size_t output_len; @@ -230,7 +230,7 @@ void encrypt_decrypt_aes_ccm(void) /* Set tag length (optionally) */ if (yaca_context_set_property(ctx, YACA_PROPERTY_CCM_TAG_LEN, - (void*)&tag_len, sizeof(tag_len)) != YACA_ERROR_NONE) + (void*)&tag_len, sizeof(tag_len)) != YACA_ERROR_NONE) goto exit; /* The total plain text length must be passed (only needed if AAD is passed) */ diff --git a/examples/seal.c b/examples/seal.c index a7774eb..64b70f7 100644 --- a/examples/seal.c +++ b/examples/seal.c @@ -275,6 +275,8 @@ exit: yaca_context_destroy(ctx); yaca_key_destroy(sym_key); yaca_key_destroy(iv); + yaca_free(aad); + yaca_free(tag); yaca_key_destroy(key_pub); yaca_key_destroy(key_priv); } @@ -299,7 +301,7 @@ void encrypt_seal_aes_ccm(void) char *aad = NULL; char *tag = NULL; size_t aad_len = 16; - size_t tag_len = 12; + size_t tag_len = 8; size_t block_len; size_t output_len; @@ -423,6 +425,8 @@ exit: yaca_context_destroy(ctx); yaca_key_destroy(sym_key); yaca_key_destroy(iv); + yaca_free(aad); + yaca_free(tag); yaca_key_destroy(key_pub); yaca_key_destroy(key_priv); } -- 2.7.4