From: Niels Möller <nisse@lysator.liu.se>
Date: Fri, 8 Nov 2002 09:06:40 +0000 (+0100)
Subject: (des_ecb3_encrypt): Don't use struct initialization
X-Git-Tag: nettle_1.7_release_20030311~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eab24755c08efe0c6908295c99fc6cec25e9d068;p=thirdparty%2Fnettle.git

(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
---

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)
     {