From d41b90fa0c0cb60479cea2472700017d0b9aa471 Mon Sep 17 00:00:00 2001 From: Krzysztof Jackiewicz Date: Thu, 23 Jun 2016 10:08:01 +0200 Subject: [PATCH] YACA: Use get_output_length() where possible Change-Id: I484b8cad6ed57968c167e85a2ab03448e8b8cc30 --- src/yaca/yaca-test-digest.cpp | 4 +--- src/yaca/yaca-test-sign.cpp | 2 +- src/yaca/yaca-test-stress.cpp | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/yaca/yaca-test-digest.cpp b/src/yaca/yaca-test-digest.cpp index 8af2893..8943df0 100644 --- a/src/yaca/yaca-test-digest.cpp +++ b/src/yaca/yaca-test-digest.cpp @@ -38,9 +38,7 @@ const vector DATA = random_buffer(1024); void digest_length_test(yaca_digest_algorithm_e algo, size_t expected_bit_len) { auto ctx_ptr = digest_init(algo); - size_t output_len; - - YACA_SUCCESS(yaca_context_get_output_length(ctx_ptr.get(), 0, &output_len)); + size_t output_len = get_output_length(ctx_ptr); YACA_ASSERT_MSG(output_len == expected_bit_len / 8, "Digest " << digest2str(algo) << " produces " << output_len * 8 << diff --git a/src/yaca/yaca-test-sign.cpp b/src/yaca/yaca-test-sign.cpp index b65b69d..66abb70 100644 --- a/src/yaca/yaca-test-sign.cpp +++ b/src/yaca/yaca-test-sign.cpp @@ -41,7 +41,7 @@ void sign_length_test(yaca_digest_algorithm_e algo, YACA_SUCCESS(yaca_key_get_bit_length(key.get(), &key_bit_len)); - YACA_SUCCESS(yaca_context_get_output_length(ctx.get(), 0, &output_len)); + output_len = get_output_length(ctx); YACA_ASSERT_MSG(output_len * 8 == key_bit_len, "Sign " << digest2str(algo) << " produces " << output_len * 8 << diff --git a/src/yaca/yaca-test-stress.cpp b/src/yaca/yaca-test-stress.cpp index f974414..361aef9 100644 --- a/src/yaca/yaca-test-stress.cpp +++ b/src/yaca/yaca-test-stress.cpp @@ -51,9 +51,8 @@ void thread_fn() auto ctx = seal_init(key_pub, YACA_ENCRYPT_AES, YACA_BCM_CBC, YACA_KEY_LENGTH_256BIT, sym_key, iv); - YACA_SUCCESS(yaca_context_get_output_length(ctx.get(), LOREM4096_SIZE, &output_len)); - - YACA_SUCCESS(yaca_context_get_output_length(ctx.get(), 0, &block_len)); + output_len = get_output_length(ctx, LOREM4096_SIZE); + block_len = get_output_length(ctx); enc_size = output_len + block_len; -- 2.7.4