From eab24755c08efe0c6908295c99fc6cec25e9d068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Fri, 8 Nov 2002 10:06:40 +0100
Subject: [PATCH] (des_ecb3_encrypt): Don't use struct initialization (c89
doesn't allow non-constant initializers). Reported by James Ralston.
(des_ede3_cbc_encrypt): Likewise.
Rev: src/nettle/des-compat.c:1.7
---
des-compat.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/des-compat.c b/des-compat.c
index 022bd6ab..3a38abb4 100644
--- a/des-compat.c
+++ b/des-compat.c
@@ -61,7 +61,10 @@ des_ecb3_encrypt(des_cblock *src, des_cblock *dst,
des_key_schedule k1, des_key_schedule k2,
des_key_schedule k3, int enc)
{
- struct des_compat_des3 keys = { { k1, k2, k3 } };
+ struct des_compat_des3 keys;
+ keys.keys[0] = k1;
+ keys.keys[1] = k2;
+ keys.keys[2] = k3;
((enc == DES_ENCRYPT) ? des_compat_des3_encrypt : des_compat_des3_decrypt)
(&keys, DES_BLOCK_SIZE, *dst, *src);
@@ -142,7 +145,10 @@ des_ede3_cbc_encrypt(des_cblock *src, des_cblock *dst, long length,
des_cblock *iv,
int enc)
{
- struct des_compat_des3 keys = { { k1, k2, k3 } };
+ struct des_compat_des3 keys;
+ keys.keys[0] = k1;
+ keys.keys[1] = k2;
+ keys.keys[2] = k3;
switch (enc)
{
--
GitLab