From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Wed, 2 Jan 2013 08:39:42 +0000 (+0000)
Subject: silence compiler warnings in unused aes code, thanks Aki Tuomi. Closes #648
X-Git-Tag: auth-3.2-rc4~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1f7b4e8e94f2529d165ad4cd3c3c4da183566ee;p=thirdparty%2Fpdns.git

silence compiler warnings in unused aes code, thanks Aki Tuomi. Closes #648

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3011 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/aes/aeskey.c b/pdns/aes/aeskey.c
index a052fe8dd5..7034860b38 100644
--- a/pdns/aes/aeskey.c
+++ b/pdns/aes/aeskey.c
@@ -406,8 +406,10 @@ AES_RETURN aes_decrypt_key192(const unsigned char *key, aes_decrypt_ctx cx[1])
     cx->ks[v(48,(3))] = ss[3] = word_in(key, 3);
 
 #ifdef DEC_KS_UNROLL
-    cx->ks[v(48,(4))] = ff(ss[4] = word_in(key, 4));
-    cx->ks[v(48,(5))] = ff(ss[5] = word_in(key, 5));
+    ss[4] = word_in(key, 4);
+    cx->ks[v(48,(4))] = ff(ss[4]);
+    ss[5] = word_in(key, 5);
+    cx->ks[v(48,(5))] = ff(ss[5]);
     kdf6(cx->ks, 0); kd6(cx->ks, 1);
     kd6(cx->ks, 2);  kd6(cx->ks, 3);
     kd6(cx->ks, 4);  kd6(cx->ks, 5);
@@ -497,10 +499,14 @@ AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1])
     cx->ks[v(56,(3))] = ss[3] = word_in(key, 3);
 
 #ifdef DEC_KS_UNROLL
-    cx->ks[v(56,(4))] = ff(ss[4] = word_in(key, 4));
-    cx->ks[v(56,(5))] = ff(ss[5] = word_in(key, 5));
-    cx->ks[v(56,(6))] = ff(ss[6] = word_in(key, 6));
-    cx->ks[v(56,(7))] = ff(ss[7] = word_in(key, 7));
+    ss[4] = word_in(key, 4);
+    cx->ks[v(56,(4))] = ff(ss[4]);
+    ss[4] = word_in(key, 5);
+    cx->ks[v(56,(5))] = ff(ss[5]);
+    ss[4] = word_in(key, 6);
+    cx->ks[v(56,(6))] = ff(ss[6]);
+    ss[4] = word_in(key, 7);
+    cx->ks[v(56,(7))] = ff(ss[7]);
     kdf8(cx->ks, 0); kd8(cx->ks, 1);
     kd8(cx->ks, 2);  kd8(cx->ks, 3);
     kd8(cx->ks, 4);  kd8(cx->ks, 5);