[Pkg-haskell-commits] darcs: haskell-cryptocipher: releasing version 0.3.5-1

[Joachim Breitner]

Fri Jun 15 08:19:46 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * releasing version 0.3.5-1
  Ignore-this: 15a5760439c51fea27b3bc8a0ab3e097

    M ./changelog -3 +3
    R ./patches/
    R ./patches/fix-AES-on-BigEndian
    R ./patches/series

Fri Jun 15 08:19:46 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * releasing version 0.3.5-1
  Ignore-this: 15a5760439c51fea27b3bc8a0ab3e097
diff -rN -u old-haskell-cryptocipher//changelog new-haskell-cryptocipher//changelog
--- old-haskell-cryptocipher//changelog	2012-06-15 08:19:56.202324656 +0000
+++ new-haskell-cryptocipher//changelog	2012-06-15 08:19:56.210326989 +0000
@@ -1,8 +1,8 @@
-haskell-cryptocipher (0.3.5-1) UNRELEASED; urgency=low
+haskell-cryptocipher (0.3.5-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release, includes our patch.
 
- -- Joachim Breitner <nomeata at debian.org>  Fri, 15 Jun 2012 10:17:13 +0200
+ -- Joachim Breitner <nomeata at debian.org>  Fri, 15 Jun 2012 10:18:36 +0200
 
 haskell-cryptocipher (0.3.3-3) unstable; urgency=low
 
diff -rN -u old-haskell-cryptocipher//patches/fix-AES-on-BigEndian new-haskell-cryptocipher//patches/fix-AES-on-BigEndian
--- old-haskell-cryptocipher//patches/fix-AES-on-BigEndian	2012-06-15 08:19:56.202324656 +0000
+++ new-haskell-cryptocipher//patches/fix-AES-on-BigEndian	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-Description: Fix AES code on big endian machines
-Author: Joachim Breitner <nomeata at debian.org>
-Bug-Debian: http://bugs.debian.org/674811
-Bug: https://github.com/vincenthz/hs-cryptocipher/issues/16
-Forwarded: https://github.com/vincenthz/hs-cryptocipher/pull/17
-
---- haskell-cryptocipher-0.3.3.orig/Crypto/Cipher/AES/Haskell.hs
-+++ haskell-cryptocipher-0.3.3/Crypto/Cipher/AES/Haskell.hs
-@@ -313,13 +313,26 @@ coreExpandKey vkey
- 		cR0 it r0 r1 r2 r3 =
- 			(sbox r1 `xor` rcon it, sbox r2, sbox r3, sbox r0)
- 
-+rotateR' :: Word32 -> Int -> Word32
-+rotateR' = case getSystemEndianness of
-+           LittleEndian -> rotateR
-+           BigEndian    -> rotateL
-+{-# INLINE rotateR' #-}
-+
-+rotateL' :: Word32 -> Int -> Word32
-+rotateL' = case getSystemEndianness of
-+           LittleEndian -> rotateL
-+           BigEndian    -> rotateR
-+{-# INLINE rotateL' #-}
-+
-+
- {-# INLINE shiftRows #-}
- shiftRows :: AESState -> IO ()
- shiftRows blk = do
- 	r32 blk 0 >>= w32 blk 0 . msbox32
--	r32 blk 1 >>= \t1 -> w32 blk 1 $ rotateR (msbox32 t1) 8
--	r32 blk 2 >>= \t2 -> w32 blk 2 $ rotateR (msbox32 t2) 16
--	r32 blk 3 >>= \t3 -> w32 blk 3 $ rotateR (msbox32 t3) 24
-+	r32 blk 1 >>= \t1 -> w32 blk 1 $ rotateR' (msbox32 t1) 8
-+	r32 blk 2 >>= \t2 -> w32 blk 2 $ rotateR' (msbox32 t2) 16
-+	r32 blk 3 >>= \t3 -> w32 blk 3 $ rotateR' (msbox32 t3) 24
- 
- {-# INLINE addRoundKey #-}
- addRoundKey :: Key -> Int -> AESState -> IO ()
-@@ -353,9 +366,9 @@ mixColumns state = pr 0 >> pr 1 >> pr 2
- shiftRowsInv :: AESState -> IO ()
- shiftRowsInv blk = do
- 	r32 blk 0 >>= w32 blk 0 . mrsbox32
--	r32 blk 1 >>= \t1 -> w32 blk 1 $ mrsbox32 $ rotateL t1 8
--	r32 blk 2 >>= \t2 -> w32 blk 2 $ mrsbox32 $ rotateL t2 16
--	r32 blk 3 >>= \t3 -> w32 blk 3 $ mrsbox32 $ rotateL t3 24
-+	r32 blk 1 >>= \t1 -> w32 blk 1 $ mrsbox32 $ rotateL' t1 8
-+	r32 blk 2 >>= \t2 -> w32 blk 2 $ mrsbox32 $ rotateL' t2 16
-+	r32 blk 3 >>= \t3 -> w32 blk 3 $ mrsbox32 $ rotateL' t3 24
- 
- {-# INLINE mixColumnsInv #-}
- mixColumnsInv :: AESState -> IO ()
diff -rN -u old-haskell-cryptocipher//patches/series new-haskell-cryptocipher//patches/series
--- old-haskell-cryptocipher//patches/series	2012-06-15 08:19:56.202324656 +0000
+++ new-haskell-cryptocipher//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-fix-AES-on-BigEndian