From 09f2af0b3bd0e3a402845c288da1507a22c294f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sun, 2 Mar 2003 17:12:03 +0100
Subject: [PATCH] (time_cipher): Don't use GNU C non-constant initializers.
Rev: src/nettle/examples/nettle-benchmark.c:1.7
---
examples/nettle-benchmark.c | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c
index ab6482d6..98799c1c 100644
--- a/examples/nettle-benchmark.c
+++ b/examples/nettle-benchmark.c
@@ -173,8 +173,11 @@ time_cipher(const struct nettle_cipher *cipher)
init_data(data);
{
- struct bench_cipher_info info
- = { ctx, cipher->encrypt, data };
+ /* Decent initializers are a GNU extension, so don't use it here. */
+ struct bench_cipher_info info;
+ info.ctx = ctx;
+ info.crypt = cipher->encrypt;
+ info.data = data;
init_key(cipher->key_size, key);
cipher->set_encrypt_key(ctx, cipher->key_size, key);
@@ -184,8 +187,10 @@ time_cipher(const struct nettle_cipher *cipher)
}
{
- struct bench_cipher_info info
- = { ctx, cipher->decrypt, data };
+ struct bench_cipher_info info;
+ info.ctx = ctx;
+ info.crypt = cipher->decrypt;
+ info.data = data;
init_key(cipher->key_size, key);
cipher->set_decrypt_key(ctx, cipher->key_size, key);
@@ -200,8 +205,12 @@ time_cipher(const struct nettle_cipher *cipher)
/* Do CBC mode */
{
- struct bench_cbc_info info
- = { ctx, cipher->encrypt, data, cipher->block_size, iv };
+ struct bench_cbc_info info;
+ info.ctx = ctx;
+ info.crypt = cipher->encrypt;
+ info.data = data;
+ info.block_size = cipher->block_size;
+ info.iv = iv;
memset(iv, 0, sizeof(iv));
@@ -212,8 +221,12 @@ time_cipher(const struct nettle_cipher *cipher)
}
{
- struct bench_cbc_info info
- = { ctx, cipher->decrypt, data, cipher->block_size, iv };
+ struct bench_cbc_info info;
+ info.ctx = ctx;
+ info.crypt = cipher->decrypt;
+ info.data = data;
+ info.block_size = cipher->block_size;
+ info.iv = iv;
memset(iv, 0, sizeof(iv));
--
GitLab