undef Macros after usage & rename duplicate symbols

Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>

Author: sjaeckel

src/ciphers/aes/aes.c

@@ -726,5 +726,11 @@ int ECB_KS(int *keysize)
    return CRYPT_OK;
 }
 
-#endif
+#undef SETUP
+#undef ECB_ENC
+#undef ECB_DEC
+#undef ECB_DONE
+#undef ECB_TEST
+#undef ECB_KS
 
+#endif

src/ciphers/anubis.c

@@ -26,6 +26,14 @@ const struct ltc_cipher_descriptor anubis_desc = {
 
 #define MAX_N           10
 
+
+#define T0 anubis_T0
+#define T1 anubis_T1
+#define T2 anubis_T2
+#define T3 anubis_T3
+#define T4 anubis_T4
+#define T5 anubis_T5
+#define rc anubis_rc
 /*
  * Though Anubis is endianness-neutral, the encryption tables are listed
  * in BIG-ENDIAN format, which is adopted throughout this implementation
@@ -1546,5 +1554,14 @@ int anubis_keysize(int *keysize)
    return CRYPT_OK;
 }
 
+#undef MAX_N
+#undef T0
+#undef T1
+#undef T2
+#undef T3
+#undef T4
+#undef T5
+#undef rc
+
 #endif
 

src/ciphers/blowfish.c

@@ -654,5 +654,7 @@ int blowfish_keysize(int *keysize)
    return CRYPT_OK;
 }
 
+#undef F
+
 #endif
 

src/ciphers/camellia.c

@@ -717,4 +717,6 @@ int camellia_keysize(int *keysize)
    return CRYPT_OK;
 }
 
+#undef loc
+
 #endif

src/ciphers/cast5.c

@@ -491,6 +491,7 @@ int cast5_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_
 }
 #endif
 
+#define FI cast5_FI
 LTC_INLINE static ulong32 FI(ulong32 R, ulong32 Km, ulong32 Kr)
 {
    ulong32 I;
@@ -702,4 +703,7 @@ int cast5_keysize(int *keysize)
    return CRYPT_OK;
 }
 
+#undef GB
+#undef FI
+
 #endif

src/ciphers/des.c

@@ -2238,5 +2238,8 @@ int des3_keysize(int *keysize)
     return CRYPT_OK;
 }
 
+#undef EN0
+#undef DE1
+
 #endif
 

src/ciphers/idea.c

@@ -66,6 +66,7 @@ static ushort16 s_add_inv(ushort16 x)
    return LOW16(0 - x);
 }
 
+#define s_setup_key s_idea_setup_key
 static int s_setup_key(const unsigned char *key, symmetric_key *skey)
 {
    int i, j;
@@ -247,4 +248,11 @@ int idea_test(void)
 #endif
 }
 
+#undef LOW16
+#undef HIGH16
+#undef MUL
+#undef STORE16
+#undef LOAD16
+#undef s_setup_key
+
 #endif

src/ciphers/kasumi.c

@@ -28,6 +28,7 @@ const struct ltc_cipher_descriptor kasumi_desc = {
    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
+#define FI kasumi_FI
 static u16 FI( u16 in, u16 subkey )
 {
    u16 nine, seven;
@@ -304,4 +305,7 @@ int kasumi_test(void)
 #endif
 }
 
+#undef ROL16
+#undef FI
+
 #endif

src/ciphers/khazad.c

@@ -837,4 +837,6 @@ int khazad_keysize(int *keysize)
    return CRYPT_INVALID_KEYSIZE;
 }
 
+#undef R
+
 #endif

src/ciphers/kseed.c

@@ -363,4 +363,7 @@ int kseed_keysize(int *keysize)
    return CRYPT_OK;
 }
 
+#undef G
+#undef F
+
 #endif