init hw symbol clash

tracsis · Jan 20, 2014 · 59ac1db · 59ac1db
1 parent 85a45c8
commit 59ac1db
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/Benchmark/bench.hs b/Benchmark/bench.hs
@@ -2,7 +2,6 @@ import Crypto.Cipher.AES128
 import Crypto.Cipher.AES
 import Crypto.Classes
 import Crypto.Types
-import Crypto.Modes (zeroIV)
 import Criterion
 import Criterion.Main
 import System.Entropy

diff --git a/cbits/aes.c b/cbits/aes.c
@@ -243,7 +243,7 @@ void tmd_aes_initkey(aes_key *key, uint8_t *origkey, uint8_t size)
         case 32: key->nbr = 14; key->strength = 2; break;
         }
 #if defined(ARCH_X86) && defined(WITH_AESNI)
-        initialize_hw(tmd_initialize_table_ni);
+        tmd_initialize_hw(tmd_initialize_table_ni);
 #endif
         init_f _init = GET_INIT(key->strength);
         _init(key, origkey, size);

diff --git a/cbits/cpu.c b/cbits/cpu.c
@@ -54,7 +54,7 @@ static void cpuid(uint32_t info, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, ui
 }
 
 #ifdef USE_AESNI
-void initialize_hw(void (*init_table)(int, int))
+void tmd_initialize_hw(void (*init_table)(int, int))
 {
 	static int inited = 0;
 	if (inited == 0) {

diff --git a/cbits/cpu.h b/cbits/cpu.h
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef USE_AESNI
-void initialize_hw(void (*init_table)(int, int));
+void tmd_initialize_hw(void (*init_table)(int, int));
 #else
 #define initialize_hw(init_table) 	(0)
 #endif

diff --git a/cipher-aes128.cabal b/cipher-aes128.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                cipher-aes128
-version:             0.6.2
+version:             0.6.3
 synopsis:            AES and common modes using AES-NI when available.
 description:         Cipher-aes128 is an implementation of AES and common modes of operation.  It borrows Hanquez's C AES code (see 'cipher-aes') but
                      is unique due to including compile-time detection of