From 625e313e745e0f7dec621fcdb6908beed4ccb593 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 6 Dec 2017 12:16:37 +0000 Subject: [PATCH] Avoid an expression in a assert() with side effects --- test/default/kdf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/default/kdf.c b/test/default/kdf.c index 48225c5a..8716de08 100644 --- a/test/default/kdf.c +++ b/test/default/kdf.c @@ -10,6 +10,7 @@ tv_kdf(void) char *context; char hex[crypto_kdf_BYTES_MAX * 2 + 1]; uint64_t i; + int ret; context = (char *) sodium_malloc(crypto_kdf_CONTEXTBYTES); memcpy(context, "KDF test", strlen("KDF test")); @@ -19,8 +20,9 @@ tv_kdf(void) } subkey = (unsigned char *) sodium_malloc(crypto_kdf_BYTES_MAX); for (i = 0; i < 10; i++) { - assert(crypto_kdf_derive_from_key(subkey, crypto_kdf_BYTES_MAX, - i, context, master_key) == 0); + ret = crypto_kdf_derive_from_key(subkey, crypto_kdf_BYTES_MAX, + i, context, master_key); + assert(ret == 0); sodium_bin2hex(hex, sizeof hex, subkey, crypto_kdf_BYTES_MAX); printf("%s\n", hex); }