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 a052fe8dd530a463eceb4445431b9aabbf425596..7034860b386f4c6ce346229fc824b315af15d29c 100644 (file)
--- 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);\r
 \r
 #ifdef DEC_KS_UNROLL\r
-    cx->ks[v(48,(4))] = ff(ss[4] = word_in(key, 4));\r
-    cx->ks[v(48,(5))] = ff(ss[5] = word_in(key, 5));\r
+    ss[4] = word_in(key, 4);\r
+    cx->ks[v(48,(4))] = ff(ss[4]);\r
+    ss[5] = word_in(key, 5);\r
+    cx->ks[v(48,(5))] = ff(ss[5]);\r
     kdf6(cx->ks, 0); kd6(cx->ks, 1);\r
     kd6(cx->ks, 2);  kd6(cx->ks, 3);\r
     kd6(cx->ks, 4);  kd6(cx->ks, 5);\r
@@ -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);\r
 \r
 #ifdef DEC_KS_UNROLL\r
-    cx->ks[v(56,(4))] = ff(ss[4] = word_in(key, 4));\r
-    cx->ks[v(56,(5))] = ff(ss[5] = word_in(key, 5));\r
-    cx->ks[v(56,(6))] = ff(ss[6] = word_in(key, 6));\r
-    cx->ks[v(56,(7))] = ff(ss[7] = word_in(key, 7));\r
+    ss[4] = word_in(key, 4);\r
+    cx->ks[v(56,(4))] = ff(ss[4]);\r
+    ss[4] = word_in(key, 5);\r
+    cx->ks[v(56,(5))] = ff(ss[5]);\r
+    ss[4] = word_in(key, 6);\r
+    cx->ks[v(56,(6))] = ff(ss[6]);\r
+    ss[4] = word_in(key, 7);\r
+    cx->ks[v(56,(7))] = ff(ss[7]);\r
     kdf8(cx->ks, 0); kd8(cx->ks, 1);\r
     kd8(cx->ks, 2);  kd8(cx->ks, 3);\r
     kd8(cx->ks, 4);  kd8(cx->ks, 5);\r