summaryrefslogtreecommitdiff
path: root/des-compat.c
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2002-11-08 10:06:40 +0100
committerNiels Möller <nisse@lysator.liu.se>2002-11-08 10:06:40 +0100
commiteab24755c08efe0c6908295c99fc6cec25e9d068 (patch)
tree7ab288cd07d3fe2214fa6d6540cfb6e8c9c28ee9 /des-compat.c
parent235f6868d772246713eb0c6e73f6b380d96c850f (diff)
downloadnettle-eab24755c08efe0c6908295c99fc6cec25e9d068.tar.gz
(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
Diffstat (limited to 'des-compat.c')
-rw-r--r--des-compat.c10
1 files 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)
{