[DHG_packages] 01/01: cryptonite: Upgrading from 0.6 to 0.10
Clint Adams
clint at moszumanska.debian.org
Sun Jan 10 01:52:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch master
in repository DHG_packages.
commit 34e1162712ca40cb4f25403226c2a3a29245352c
Author: Clint Adams <clint at debian.org>
Date: Sat Jan 9 19:03:58 2016 -0500
cryptonite: Upgrading from 0.6 to 0.10
---
p/haskell-cryptonite/debian/changelog | 7 ++
p/haskell-cryptonite/debian/control | 4 +-
.../debian/patches/cryptonite-byteorder.patch | 95 ----------------------
.../debian/patches/integerify-endianness-fix | 15 ----
.../debian/patches/number-test-case-fix | 57 -------------
p/haskell-cryptonite/debian/patches/series | 4 -
p/haskell-cryptonite/debian/patches/use-mkLE | 13 ---
7 files changed, 9 insertions(+), 186 deletions(-)
diff --git a/p/haskell-cryptonite/debian/changelog b/p/haskell-cryptonite/debian/changelog
index 5e1eb8b..56e669a 100644
--- a/p/haskell-cryptonite/debian/changelog
+++ b/p/haskell-cryptonite/debian/changelog
@@ -1,3 +1,10 @@
+haskell-cryptonite (0.10-1) unstable; urgency=medium
+
+ * New upstream version.
+ - Drop all patches.
+
+ -- Clint Adams <clint at debian.org> Sat, 09 Jan 2016 19:03:57 -0500
+
haskell-cryptonite (0.6-5) unstable; urgency=medium
* Switch Vcs-Git/Vcs-Browser headers to new location.
diff --git a/p/haskell-cryptonite/debian/control b/p/haskell-cryptonite/debian/control
index 06ef2864..0c8dee4 100644
--- a/p/haskell-cryptonite/debian/control
+++ b/p/haskell-cryptonite/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
cdbs,
ghc,
ghc-prof,
- libghc-memory-dev (>= 0.2),
+ libghc-memory-dev (>= 0.8),
libghc-memory-prof,
libghc-byteorder-dev,
libghc-byteorder-prof,
@@ -34,7 +34,7 @@ X-Description: cryptographic primitives
- MAC: HMAC, Poly1305
- Asymmetric crypto: DSA, RSA, DH, ECDH, ECDSA, ECC, Curve25519,
Ed25519
- - Key Derivation Function: PBKDF2, Scrypt
+ - Key Derivation Function: BCrypt, PBKDF2, Scrypt
- Cryptographic Random generation: System Entropy, Deterministic
Random Generator
- Data-related: Anti-Forensic Information Splitter (AFIS)
diff --git a/p/haskell-cryptonite/debian/patches/cryptonite-byteorder.patch b/p/haskell-cryptonite/debian/patches/cryptonite-byteorder.patch
deleted file mode 100644
index 30e4600..0000000
--- a/p/haskell-cryptonite/debian/patches/cryptonite-byteorder.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: haskell-cryptonite/Crypto/Internal/CompatPrim.hs
-===================================================================
---- haskell-cryptonite.orig/Crypto/Internal/CompatPrim.hs 2015-08-25 22:03:04.947561177 +0200
-+++ haskell-cryptonite/Crypto/Internal/CompatPrim.hs 2015-08-25 22:03:04.943561093 +0200
-@@ -18,32 +18,29 @@
- module Crypto.Internal.CompatPrim
- ( be32Prim
- , le32Prim
-- , byteswap32Prim
- , booleanPrim
-- , convert4To32
- ) where
-
- import GHC.Prim
-+import System.ByteOrder
-
- -- | byteswap Word# to or from Big Endian
- --
- -- on a big endian machine, this function is a nop.
- be32Prim :: Word# -> Word#
--#ifdef ARCH_IS_LITTLE_ENDIAN
--be32Prim = byteswap32Prim
--#else
--be32Prim w = w
--#endif
-+be32Prim w = case byteOrder of
-+ BigEndian -> w
-+ LittleEndian -> byteswap32Prim w
-+ _ -> error "be32Prim"
-
- -- | byteswap Word# to or from Little Endian
- --
- -- on a little endian machine, this function is a nop.
- le32Prim :: Word# -> Word#
--#ifdef ARCH_IS_LITTLE_ENDIAN
--le32Prim w = w
--#else
--le32Prim = byteswap32Prim
--#endif
-+le32Prim w = case byteOrder of
-+ BigEndian -> byteswap32Prim w
-+ LittleEndian -> w
-+ _ -> error "le32Prim"
-
- -- | Simple compatibility for byteswap the lower 32 bits of a Word#
- -- at the primitive level
-@@ -59,23 +56,6 @@
- in or# a (or# b (or# c d))
- #endif
-
---- | combine 4 word8 [a,b,c,d] to a word32 representing [a,b,c,d]
--convert4To32 :: Word# -> Word# -> Word# -> Word#
-- -> Word#
--convert4To32 a b c d = or# (or# c1 c2) (or# c3 c4)
-- where
--#ifdef ARCH_IS_LITTLE_ENDIAN
-- !c1 = uncheckedShiftL# a 24#
-- !c2 = uncheckedShiftL# b 16#
-- !c3 = uncheckedShiftL# c 8#
-- !c4 = d
--#else
-- !c1 = uncheckedShiftL# d 24#
-- !c2 = uncheckedShiftL# c 16#
-- !c3 = uncheckedShiftL# b 8#
-- !c4 = a
--#endif
--
- -- | Simple wrapper to handle pre 7.8 and future, where
- -- most comparaison functions don't returns a boolean
- -- anymore.
-Index: haskell-cryptonite/cryptonite.cabal
-===================================================================
---- haskell-cryptonite.orig/cryptonite.cabal 2015-08-25 22:03:04.947561177 +0200
-+++ haskell-cryptonite/cryptonite.cabal 2015-08-25 22:03:04.943561093 +0200
-@@ -165,6 +165,7 @@
- Crypto.Internal.Words
- Crypto.Internal.WordArray
- Build-depends: base >= 4.3 && < 5
-+ , byteorder
- , bytestring
- , memory >= 0.2
- , ghc-prim
-@@ -199,12 +200,6 @@
- , cbits/cryptonite_sysrand.c
- include-dirs: cbits cbits/ed25519
-
-- -- FIXME armel or mispel is also little endian.
-- -- might be a good idea to also add a runtime autodetect mode.
-- -- ARCH_ENDIAN_UNKNOWN
-- if (arch(i386) || arch(x86_64))
-- CPP-options: -DARCH_IS_LITTLE_ENDIAN
--
- if arch(i386)
- CPP-options: -DARCH_X86
-
diff --git a/p/haskell-cryptonite/debian/patches/integerify-endianness-fix b/p/haskell-cryptonite/debian/patches/integerify-endianness-fix
deleted file mode 100644
index 05e78ae..0000000
--- a/p/haskell-cryptonite/debian/patches/integerify-endianness-fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Endianness fix to integerify
-Author: Edmund Grimley Evans (
-Bug: https://github.com/vincenthz/cryptonite/issues/30
-
---- haskell-cryptonite-0.6.orig/cbits/cryptonite_scrypt.c
-+++ haskell-cryptonite-0.6/cbits/cryptonite_scrypt.c
-@@ -46,7 +46,7 @@ static void blockmix_salsa8(uint32_t *in
-
- static inline uint64_t integerify(uint32_t *B, const uint32_t r)
- {
-- return le64_to_cpu(*((uint64_t *) (B + (2*r-1) * 16)));
-+ return B[(2*r-1) * 16] | (uint64_t)B[(2*r-1) * 16 + 1] << 32;
- }
-
- static inline uint32_t load32(const uint8_t *p)
diff --git a/p/haskell-cryptonite/debian/patches/number-test-case-fix b/p/haskell-cryptonite/debian/patches/number-test-case-fix
deleted file mode 100644
index 1ae24fc..0000000
--- a/p/haskell-cryptonite/debian/patches/number-test-case-fix
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: fix 0 case.
-Origin:
- https://github.com/vincenthz/cryptonite/commit/169570c9632a29c95432468016f294853bcd1ba2
- https://github.com/vincenthz/cryptonite/commit/3af592e997e30e613eb04387c699aff7de87a746
- https://github.com/vincenthz/cryptonite/commit/5f72788041b58c82e6b25c0c1e1294982eff7ed9
-
-
-Index: haskell-cryptonite/tests/Number.hs
-===================================================================
---- haskell-cryptonite.orig/tests/Number.hs 2015-08-27 17:01:23.212094172 +0200
-+++ haskell-cryptonite/tests/Number.hs 2015-08-27 17:01:46.104622646 +0200
-@@ -20,21 +20,21 @@
- ]
-
- tests = testGroup "number"
-- [ testProperty "num-bits" $ \(Int0_2901 i) ->
-+ [ testProperty "num-bits" $ \(Int1_2901 i) ->
- and [ (numBits (2^i-1) == i)
- , (numBits (2^i) == i+1)
- , (numBits (2^i + (2^i-1)) == i+1)
- ]
- , testProperty "num-bits2" $ \(Positive i) ->
- not (i `testBit` numBits i) && (i `testBit` (numBits i - 1))
-- , testProperty "generate-param" $ \testDRG (Int0_2901 bits) ->
-+ , testProperty "generate-param" $ \testDRG (Int1_2901 bits) ->
- let r = withTestDRG testDRG $ generateParams bits (Just SetHighest) False
- in r >= 0 && numBits r == bits && testBit r (bits-1)
-- , testProperty "generate-param2" $ \testDRG (Int0_2901 m1bits) ->
-+ , testProperty "generate-param2" $ \testDRG (Int1_2901 m1bits) ->
- let bits = m1bits + 1 -- make sure minimum is 2
- r = withTestDRG testDRG $ generateParams bits (Just SetTwoHighest) False
- in r >= 0 && numBits r == bits && testBit r (bits-1) && testBit r (bits-2)
-- , testProperty "generate-param-odd" $ \testDRG (Int0_2901 bits) ->
-+ , testProperty "generate-param-odd" $ \testDRG (Int1_2901 bits) ->
- let r = withTestDRG testDRG $ generateParams bits Nothing True
- in r >= 0 && odd r
- , testProperty "generate-range" $ \testDRG (Positive range) ->
-Index: haskell-cryptonite/tests/Utils.hs
-===================================================================
---- haskell-cryptonite.orig/tests/Utils.hs 2015-07-25 09:52:36.000000000 +0200
-+++ haskell-cryptonite/tests/Utils.hs 2015-08-27 17:01:43.276557340 +0200
-@@ -46,9 +46,15 @@
- newtype Int0_2901 = Int0_2901 Int
- deriving (Show,Eq,Ord)
-
-+newtype Int1_2901 = Int1_2901 Int
-+ deriving (Show,Eq,Ord)
-+
- instance Arbitrary Int0_2901 where
- arbitrary = Int0_2901 `fmap` choose (0,2901)
-
-+instance Arbitrary Int1_2901 where
-+ arbitrary = Int1_2901 `fmap` choose (1,2901)
-+
- -- | a integer wrapper with a better range property
- newtype QAInteger = QAInteger { getQAInteger :: Integer }
- deriving (Show,Eq)
diff --git a/p/haskell-cryptonite/debian/patches/series b/p/haskell-cryptonite/debian/patches/series
deleted file mode 100644
index 0a02de1..0000000
--- a/p/haskell-cryptonite/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-cryptonite-byteorder.patch
-integerify-endianness-fix
-number-test-case-fix
-use-mkLE
diff --git a/p/haskell-cryptonite/debian/patches/use-mkLE b/p/haskell-cryptonite/debian/patches/use-mkLE
deleted file mode 100644
index 740657d..0000000
--- a/p/haskell-cryptonite/debian/patches/use-mkLE
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: use mkLE instead of LE
-Author: Joachim Breitner <nomeata at debian.org>
-Bug: https://github.com/vincenthz/cryptonite/issues/31
-
---- haskell-cryptonite-0.6.orig/Crypto/Cipher/ChaChaPoly1305.hs
-+++ haskell-cryptonite-0.6/Crypto/Cipher/ChaChaPoly1305.hs
-@@ -108,5 +108,5 @@ finalize :: State -> Poly1305.Auth
- finalize (State _ macState aadLength plainLength) =
- Poly1305.finalize $ Poly1305.updates macState
- [ pad16 plainLength
-- , either (error "finalize: internal error") id $ P.fill 16 (P.putStorable (LE aadLength) >> P.putStorable (LE plainLength))
-+ , either (error "finalize: internal error") id $ P.fill 16 (P.putStorable (toLE aadLength) >> P.putStorable (toLE plainLength))
- ]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list