1 files changed, 30 insertions, 20 deletions

diff --git a/Crypto/Cipher/Cast5.hs b/Crypto/Cipher/Cast5.hs
index fb5db20..dfd30c7 100644
--- a/Crypto/Cipher/Cast5.hs
+++ b/Crypto/Cipher/Cast5.hs
@@ -14,7 +14,7 @@ import qualified Data.Vector.Unboxed as Vector
 import Data.Vector.Unboxed (Vector, (//))
 import Data.Word
 import Data.Tuple
-import Crypto.Classes
+-- import Crypto.Classes -- Thomas' crypto-api incompatible with Vincent's crypto-random.
 import Data.Serialize
 import qualified Data.ByteString as S
 import Data.Tagged (Tagged(..))
@@ -81,25 +81,32 @@ instance Cast5Bits size => Serialize (Cast5 size) where
         let Just key = buildKey bs
         return key
 
-instance Cast5Bits size => BlockCipher (Cast5 size) where
-    blockSize = Tagged 64
-    encryptBlock (Cast5 subkeys fs _ _ key) = 
-        fromW32Pair . coreCrypto nrounds subkeys fs . toW32Pair
-      where 
-        nrounds = numberOfRounds (cast5bits (undefined::size))
-    decryptBlock (Cast5 _ _ subkeys fs key) = 
-        fromW32Pair . coreCrypto nrounds subkeys fs . toW32Pair
-      where 
-        nrounds = numberOfRounds (cast5bits (undefined::size))
-    buildKey bs = Just (Cast5 subs fs subs' fs' key)
-      where
-        nrounds = numberOfRounds (cast5bits (undefined::size))
-        key = initKey bs
-        fs    = cycle [f1,f2,f3]
-        subs  = subkeys key
-        fs'   = drop (3 - (nrounds `rem` 3)) $ cycle [f3,f2,f1]
-        subs' = (reverse . take nrounds $ subs)
-    keyLength = Tagged (cast5bits (undefined::size))
+-- instance Cast5Bits size => BlockCipher (Cast5 size) where
+blockSize :: forall size. Cast5Bits size => Tagged (Cast5 size) Int
+blockSize = Tagged 64
+
+encryptBlock :: forall size. Cast5Bits size => Cast5 size -> S.ByteString -> S.ByteString
+encryptBlock (Cast5 subkeys fs _ _ key) = 
+    fromW32Pair . coreCrypto nrounds subkeys fs . toW32Pair
+  where 
+    nrounds = numberOfRounds (cast5bits (undefined::size))
+decryptBlock :: forall size. Cast5Bits size => Cast5 size -> S.ByteString -> S.ByteString
+decryptBlock (Cast5 _ _ subkeys fs key) = 
+    fromW32Pair . coreCrypto nrounds subkeys fs . toW32Pair
+  where 
+    nrounds = numberOfRounds (cast5bits (undefined::size))
+buildKey :: forall size. Cast5Bits size => S.ByteString -> Maybe (Cast5 size)
+buildKey bs = Just (Cast5 subs fs subs' fs' key)
+  where
+    nrounds = numberOfRounds (cast5bits (undefined::size))
+    key = initKey bs
+    fs    = cycle [f1,f2,f3]
+    subs  = subkeys key
+    fs'   = drop (3 - (nrounds `rem` 3)) $ cycle [f3,f2,f1]
+    subs' = (reverse . take nrounds $ subs)
+
+keyLength :: forall size. Cast5Bits size => Tagged (Cast5 size) Int
+keyLength = Tagged (cast5bits (undefined::size))
 
 
 {-# INLINE (^) #-}
@@ -544,6 +551,8 @@ hasSize :: Cast5 size -> size -> a
 hasSize _ _ = undefined
 
 
+{-
+
 data StaticTest size = StaticTest {
         keysize :: size,
         keybytes :: S.ByteString,
@@ -673,3 +682,4 @@ main = do
                                 , "expected b = " ++ show (S.unpack expected_b)
                                 , "computed b = " ++ show (S.unpack result_b)  ]
     return ()
+-}