disarm dead code that causes gcc crashes on ARM, thanks Morten Stevens

Peter van Dijk · Peter van Dijk · commit 6c4e53119b03 · 2013-04-18T12:57:44.000Z
git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3162 d19b8d6e-7fed-0310-83ef-9ca221ded41b
diff --git a/pdns/aes/aeskey.c b/pdns/aes/aeskey.c
@@ -488,6 +488,7 @@ AES_RETURN aes_decrypt_key192(const unsigned char *key, aes_decrypt_ctx cx[1])
     ss[3] ^= ss[2]; k[v(56,(8*(i))+11)] = ss[3]; \
 }
 
+#if 0
 AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1])
 {   uint_32t    ss[9];
 #if defined( d_vars )
@@ -536,11 +537,13 @@ AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1])
 #endif
     return EXIT_SUCCESS;
 }
+#endif
 
 #endif
 
 #if defined( AES_VAR )
 
+#if 0
 AES_RETURN aes_decrypt_key(const unsigned char *key, int key_len, aes_decrypt_ctx cx[1])
 {
     switch(key_len)
@@ -551,6 +554,7 @@ AES_RETURN aes_decrypt_key(const unsigned char *key, int key_len, aes_decrypt_ct
     default: return EXIT_FAILURE;
     }
 }
+#endif
 
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -488,6 +488,7 @@ AES_RETURN aes_decrypt_key192(const unsigned char *key, aes_decrypt_ctx cx[1])`
`488`	`488`	`ss[3] ^= ss[2]; k[v(56,(8*(i))+11)] = ss[3]; \`
`489`	`489`	`}`
`490`	`490`
	`491`	`+#if 0`
`491`	`492`	`AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1])`
`492`	`493`	`{ uint_32t ss[9];`
`493`	`494`	`#if defined( d_vars )`
`@@ -536,11 +537,13 @@ AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1])`
`536`	`537`	`#endif`
`537`	`538`	`return EXIT_SUCCESS;`
`538`	`539`	`}`
	`540`	`+#endif`
`539`	`541`
`540`	`542`	`#endif`
`541`	`543`
`542`	`544`	`#if defined( AES_VAR )`
`543`	`545`
	`546`	`+#if 0`
`544`	`547`	`AES_RETURN aes_decrypt_key(const unsigned char *key, int key_len, aes_decrypt_ctx cx[1])`
`545`	`548`	`{`
`546`	`549`	`switch(key_len)`
`@@ -551,6 +554,7 @@ AES_RETURN aes_decrypt_key(const unsigned char *key, int key_len, aes_decrypt_ct`
`551`	`554`	`default: return EXIT_FAILURE;`
`552`	`555`	`}`
`553`	`556`	`}`
	`557`	`+#endif`
`554`	`558`
`555`	`559`	`#endif`
`556`	`560`