diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,21 @@ # CHANGELOG for crypton +## 1.1.1 + +* On iOS, ScrubbedBytes based hashing is used for seedNew. On other + plateforms, entropy is used directly as used to be. + [#71](https://github.com/kazu-yamamoto/crypton/pull/71) + +## 1.1.0 + +* Removing "basement" and "memory". + [#67](https://github.com/kazu-yamamoto/crypton/pull/67) + + ## 1.0.7 -+ Stop depending on basement, use upstream dependencies instead -+ Stop transitively depending on basement by depending on ram. + +* Stop depending on basement, use upstream dependencies instead +* Stop transitively depending on basement by depending on ram. ## 1.0.6 diff --git a/Crypto/Cipher/Twofish/Primitive.hs b/Crypto/Cipher/Twofish/Primitive.hs --- a/Crypto/Cipher/Twofish/Primitive.hs +++ b/Crypto/Cipher/Twofish/Primitive.hs @@ -16,6 +16,7 @@ import Data.Bits import Data.List (foldl') import Data.Word +import Prelude hiding (foldl') -- Based on the Golang referance implementation -- https://github.com/golang/crypto/blob/master/twofish/twofish.go diff --git a/Crypto/ConstructHash/MiyaguchiPreneel.hs b/Crypto/ConstructHash/MiyaguchiPreneel.hs --- a/Crypto/ConstructHash/MiyaguchiPreneel.hs +++ b/Crypto/ConstructHash/MiyaguchiPreneel.hs @@ -16,6 +16,7 @@ ) where import Data.List (foldl') +import Prelude hiding (foldl') import Crypto.Cipher.Types import Crypto.Data.Padding (Format (ZERO), pad) diff --git a/Crypto/MAC/CMAC.hs b/Crypto/MAC/CMAC.hs --- a/Crypto/MAC/CMAC.hs +++ b/Crypto/MAC/CMAC.hs @@ -19,6 +19,7 @@ import Data.Bits (setBit, shiftL, testBit) import Data.List (foldl') import Data.Word +import Prelude hiding (foldl') import Crypto.Cipher.Types import Crypto.Internal.ByteArray (ByteArray, ByteArrayAccess, Bytes) diff --git a/Crypto/Number/F2m.hs b/Crypto/Number/F2m.hs --- a/Crypto/Number/F2m.hs +++ b/Crypto/Number/F2m.hs @@ -26,6 +26,7 @@ import Crypto.Number.Basic import Data.Bits (setBit, shift, testBit, unsafeShiftR, xor) import Data.List (foldl') +import Prelude hiding (foldl') -- | Binary Polynomial represented by an integer type BinaryPolynomial = Integer diff --git a/Crypto/PubKey/ECDSA.hs b/Crypto/PubKey/ECDSA.hs --- a/Crypto/PubKey/ECDSA.hs +++ b/Crypto/PubKey/ECDSA.hs @@ -56,7 +56,6 @@ import qualified Crypto.ECC.Simple.Types as Simple import Crypto.Error import Crypto.Hash -import Crypto.Hash.Types import Crypto.Internal.ByteArray (ByteArray, ByteArrayAccess) import Crypto.Internal.Imports import Crypto.Number.ModArithmetic (inverseFermat) diff --git a/Crypto/PubKey/Internal.hs b/Crypto/PubKey/Internal.hs --- a/Crypto/PubKey/Internal.hs +++ b/Crypto/PubKey/Internal.hs @@ -13,6 +13,7 @@ import Data.Bits (shiftR) import Data.List (foldl') +import Prelude hiding (foldl') import Crypto.Hash import Crypto.Internal.ByteArray (ByteArrayAccess) diff --git a/Crypto/Random.hs b/Crypto/Random.hs --- a/Crypto/Random.hs +++ b/Crypto/Random.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} -- | @@ -33,7 +34,6 @@ ) where import Crypto.Error -import Crypto.Hash (Digest, SHA512, hash) import Crypto.Internal.Imports import Crypto.Random.ChaChaDRG import Crypto.Random.SystemDRG @@ -43,6 +43,13 @@ import qualified Crypto.Number.Serialize as Serialize +#ifdef INSECURE_ENTROPY +import Crypto.Hash (SHA512, Context) +import Crypto.Hash.IO +import Data.Memory.PtrMethods (memSet) +import Foreign.Ptr (Ptr, castPtr) +#endif + newtype Seed = Seed ScrubbedBytes deriving (ByteArrayAccess) @@ -52,15 +59,29 @@ -- | Create a new Seed from system entropy seedNew :: MonadRandom randomly => randomly Seed + +#ifdef INSECURE_ENTROPY -- The degree of its randomness depends on the source, e.g. for iOS we -- have to compile with DoNotUseEntropy flag, as iOS doesn't allow -- using getentropy, and on some other systems it can be also -- potentially comprisable sources. Hashing of entropy before using -- it as a seed is a common mitigation for attacks via RNG/entropy -- source. -seedNew = - (Seed . B.take seedLength . B.convert . (hash :: ScrubbedBytes -> Digest SHA512)) - `fmap` getRandomBytes 64 +seedNew = (Seed . scrubbedHash512) `fmap` getRandomBytes 64 + +scrubbedHash512 :: ScrubbedBytes -> ScrubbedBytes +scrubbedHash512 = B.take seedLength . hash512 + where + hash512 ba = B.unsafeCreate (hashDigestSize (undefined :: SHA512)) $ hashIO ba + hashIO ba ptr = do + ctx <- hashMutableInit + hashMutableUpdate (ctx :: MutableContext SHA512) ba + B.withByteArray ctx $ \pctx -> do + hashInternalFinalize (castPtr pctx :: Ptr (Context SHA512)) ptr + memSet pctx 0 $ hashInternalContextSize (undefined :: SHA512) +#else +seedNew = Seed `fmap` getRandomBytes seedLength +#endif -- | Convert a Seed to an integer seedToInteger :: Seed -> Integer diff --git a/crypton.cabal b/crypton.cabal --- a/crypton.cabal +++ b/crypton.cabal @@ -1,13 +1,15 @@ cabal-version: 1.18 name: crypton -version: 1.1.0 +version: 1.1.1 license: BSD3 license-file: LICENSE copyright: Vincent Hanquez maintainer: Kazu Yamamoto author: Vincent Hanquez stability: experimental -tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.7 || ==9.8.4 || ==9.10.1 || ==9.12.1 +tested-with: + ghc ==9.2.8 || ==9.4.8 || ==9.6.7 || ==9.8.4 || ==9.10.1 || ==9.12.1 + homepage: https://github.com/kazu-yamamoto/crypton bug-reports: https://github.com/kazu-yamamoto/crypton/issues synopsis: Cryptography Primitives sink @@ -121,7 +123,6 @@ manual: True library - -- cabal-fmt: expand . -CHANGELOG -CONTRIBUTING -Crypto.Math.Polynomial -Crypto.Random.Entropy.RDRand -Crypto.Random.Entropy.Unix -Crypto.Random.Entropy.Windows -LICENSE -Makefile -QA -README -Setup -Crypto.Cipher.Blowfish.Box -Crypto.Cipher.Blowfish.Primitive -Crypto.Cipher.CAST5.Primitive -Crypto.Cipher.Camellia.Primitive -Crypto.Cipher.DES.Primitive -Crypto.Cipher.Twofish.Primitive -Crypto.Cipher.Types.AEAD -Crypto.Cipher.Types.Base -Crypto.Cipher.Types.Block -Crypto.Cipher.Types.GF -Crypto.Cipher.Types.Stream -Crypto.Cipher.Types.Utils -Crypto.ECC.Simple.Prim -Crypto.ECC.Simple.Types -Crypto.Error.Types -Crypto.Hash.Blake2 -Crypto.Hash.Blake2b -Crypto.Hash.Blake2bp -Crypto.Hash.Blake2s -Crypto.Hash.Blake2sp -Crypto.Hash.Keccak -Crypto.Hash.MD2 -Crypto.Hash.MD4 -Crypto.Hash.MD5 -Crypto.Hash.RIPEMD160 -Crypto.Hash.SHA1 -Crypto.Hash.SHA224 -Crypto.Hash.SHA256 -Crypto.Hash.SHA3 -Crypto.Hash.SHA384 -Crypto.Hash.SHA512 -Crypto.Hash.SHA512t -Crypto.Hash.SHAKE -Crypto.Hash.Skein256 -Crypto.Hash.Skein512 -Crypto.Hash.Tiger -Crypto.Hash.Types -Crypto.Hash.Whirlpool -Crypto.Internal.Builder -Crypto.Internal.ByteArray -Crypto.Internal.Compat -Crypto.Internal.CompatPrim -Crypto.Internal.DeepSeq -Crypto.Internal.Endian -Crypto.Internal.Imports -Crypto.Internal.Nat -Crypto.Internal.WordArray -Crypto.Internal.Words -Crypto.Number.Compat -Crypto.PubKey.ElGamal -Crypto.PubKey.Internal -Crypto.Random.ChaChaDRG -Crypto.Random.Entropy.Backend -Crypto.Random.Entropy.Source -Crypto.Random.HmacDRG -Crypto.Random.Probabilistic -Crypto.Random.SystemDRG -Crypto.Cipher.AES.Primitive exposed-modules: Crypto.Cipher.AES Crypto.Cipher.AESGCMSIV @@ -204,6 +205,37 @@ Crypto.System.CPU Crypto.Tutorial + cc-options: -std=gnu99 + c-sources: + cbits/argon2/argon2.c + cbits/crypton_blake2b.c + cbits/crypton_blake2bp.c + cbits/crypton_blake2s.c + cbits/crypton_blake2sp.c + cbits/crypton_chacha.c + cbits/crypton_cpu.c + cbits/crypton_md2.c + cbits/crypton_md4.c + cbits/crypton_md5.c + cbits/crypton_pbkdf2.c + cbits/crypton_poly1305.c + cbits/crypton_rc4.c + cbits/crypton_ripemd.c + cbits/crypton_salsa.c + cbits/crypton_scrypt.c + cbits/crypton_sha1.c + cbits/crypton_sha256.c + cbits/crypton_sha3.c + cbits/crypton_sha512.c + cbits/crypton_skein256.c + cbits/crypton_skein512.c + cbits/crypton_tiger.c + cbits/crypton_whirlpool.c + cbits/crypton_xsalsa.c + cbits/ed25519/ed25519.c + cbits/p256/p256.c + cbits/p256/p256_ec.c + other-modules: Crypto.Cipher.AES.Primitive Crypto.Cipher.Blowfish.Box @@ -264,37 +296,6 @@ Crypto.Random.Probabilistic Crypto.Random.SystemDRG - cc-options: -std=gnu99 - c-sources: - cbits/argon2/argon2.c - cbits/crypton_blake2b.c - cbits/crypton_blake2bp.c - cbits/crypton_blake2s.c - cbits/crypton_blake2sp.c - cbits/crypton_chacha.c - cbits/crypton_cpu.c - cbits/crypton_md2.c - cbits/crypton_md4.c - cbits/crypton_md5.c - cbits/crypton_pbkdf2.c - cbits/crypton_poly1305.c - cbits/crypton_rc4.c - cbits/crypton_ripemd.c - cbits/crypton_salsa.c - cbits/crypton_scrypt.c - cbits/crypton_sha1.c - cbits/crypton_sha256.c - cbits/crypton_sha3.c - cbits/crypton_sha512.c - cbits/crypton_skein256.c - cbits/crypton_skein512.c - cbits/crypton_tiger.c - cbits/crypton_whirlpool.c - cbits/crypton_xsalsa.c - cbits/ed25519/ed25519.c - cbits/p256/p256.c - cbits/p256/p256_ec.c - default-language: Haskell2010 include-dirs: cbits cbits/ed25519 cbits/decaf/include cbits/decaf/p448 @@ -302,25 +303,25 @@ ghc-options: -Wall -fwarn-tabs -optc-O3 build-depends: - base >=4.13 && <5 - , bytestring - , primitive >=0.9 - , deepseq - , base16 >=1.0 - , bytestring - , text - , ram >=0.20.1 && < 0.22 + base >=4.13 && <5, + bytestring, + primitive >=0.9, + deepseq, + base16 >=1.0, + bytestring, + text, + ram >=0.20.1 && <0.22 if flag(old_toolchain_inliner) cc-options: -fgnu89-inline - if (arch(x86_64) || arch(aarch64) || arch(loongarch64) || arch(ppc64le) || arch(riscv64) || arch(s390x) || arch(alpha) || arch(ppc64) || arch(sparc64)) + if ((((((((arch(x86_64) || arch(aarch64)) || arch(loongarch64)) || arch(ppc64le)) || arch(riscv64)) || arch(s390x)) || arch(alpha)) || arch(ppc64)) || arch(sparc64)) include-dirs: cbits/include64 else include-dirs: cbits/include32 - if (arch(x86_64) || arch(aarch64) || arch(loongarch64) || arch(ppc64le) || arch(riscv64) || arch(s390x) || arch(alpha) || arch(ppc64) || arch(sparc64)) + if ((((((((arch(x86_64) || arch(aarch64)) || arch(loongarch64)) || arch(ppc64le)) || arch(riscv64)) || arch(s390x)) || arch(alpha)) || arch(ppc64)) || arch(sparc64)) c-sources: cbits/decaf/ed448goldilocks/decaf_all.c cbits/decaf/ed448goldilocks/eddsa.c @@ -344,13 +345,13 @@ include-dirs: cbits/decaf/include/arch_32 cbits/decaf/p448/arch_32 - if (arch(x86_64) || arch(aarch64) || arch(loongarch64) || arch(ppc64le) || arch(riscv64) || arch(s390x) || arch(alpha) || arch(ppc64) || arch(sparc64)) + if ((((((((arch(x86_64) || arch(aarch64)) || arch(loongarch64)) || arch(ppc64le)) || arch(riscv64)) || arch(s390x)) || arch(alpha)) || arch(ppc64)) || arch(sparc64)) c-sources: cbits/curve25519/curve25519-donna-c64.c else c-sources: cbits/curve25519/curve25519-donna.c - if (arch(i386) || arch(x86_64) || arch(loongarch64) || arch(ppc64le) || arch(riscv64) || arch(alpha)) + if (((((arch(i386) || arch(x86_64)) || arch(loongarch64)) || arch(ppc64le)) || arch(riscv64)) || arch(alpha)) cpp-options: -DARCH_IS_LITTLE_ENDIAN if arch(i386) @@ -420,7 +421,7 @@ else other-modules: Crypto.Random.Entropy.Unix - if (impl(ghc) && flag(integer-gmp)) + if (impl(ghc >=0) && flag(integer-gmp)) build-depends: integer-gmp if flag(support_deepseq) @@ -433,12 +434,13 @@ if flag(use_target_attributes) cc-options: -DWITH_TARGET_ATTRIBUTES + if os(ios) + cpp-options: -DINSECURE_ENTROPY + test-suite test-crypton type: exitcode-stdio-1.0 main-is: Tests.hs hs-source-dirs: tests - - -- cabal-fmt: expand tests -Tests other-modules: BCrypt BCryptPBKDF @@ -503,14 +505,14 @@ -Wall -fno-warn-orphans -fno-warn-missing-signatures -rtsopts build-depends: - base >=4.13 && <5 - , bytestring - , crypton - , ram - , tasty - , tasty-hunit - , tasty-kat - , tasty-quickcheck + base >=4.13 && <5, + bytestring, + crypton, + ram, + tasty, + tasty-hunit, + tasty-kat, + tasty-quickcheck benchmark bench-crypton type: exitcode-stdio-1.0 @@ -520,12 +522,10 @@ default-language: Haskell2010 ghc-options: -Wall -fno-warn-missing-signatures build-depends: - base >=4.13 && <5 - , bytestring - , crypton - , deepseq - , gauge - , ram - , random - --- cabal-fmt: indent 4 + base >=4.13 && <5, + bytestring, + crypton, + deepseq, + gauge, + ram, + random