tls 1.1.2 → 1.1.3

raw patch · 3 files changed

+8/−7 lines, 3 filesdep +crypto-randomdep −crypto-random-apidep ~cprng-aesdep ~crypto-pubkey

Dependencies added: crypto-random

Dependencies removed: crypto-random-api

Dependency ranges changed: cprng-aes, crypto-pubkey

Files

• Network/TLS/State.hs +1/−1
• Tests/PubKey.hs +2/−1
• tls.cabal +5/−5

@@ -223,7 +223,7 @@ genTLSRandom :: (MonadState TLSState m, MonadError TLSError m) => Int -> m Bytes genTLSRandom n = do         st <- get-        case withTLSRNG (stRandomGen st) (genRandomBytes n) of+        case withTLSRNG (stRandomGen st) (cprgGenerate n) of                 (bytes, rng') -> put (st { stRandomGen = rng' }) >> return bytes  makeDigest :: MonadState TLSState m => Bool -> Header -> Bytes -> m Bytes

@@ -6,6 +6,7 @@  import Test.QuickCheck +import Crypto.Random (createTestEntropyPool) import qualified Crypto.Random.AESCtr as RNG import qualified Crypto.PubKey.RSA as RSA @@ -16,7 +17,7 @@  arbitraryRSAPair :: Gen (RSA.PublicKey, RSA.PrivateKey) arbitraryRSAPair = do-        rng <- (maybe (error "making rng") id . RNG.make . B.pack) `fmap` vector 64+        rng <- (RNG.make . createTestEntropyPool . B.pack) `fmap` vector 64         arbitraryRSAPairWithRNG rng  arbitraryRSAPairWithRNG rng = return $ fst $ RSA.generate rng 128 0x10001

@@ -1,5 +1,5 @@ Name:                tls-Version:             1.1.2+Version:             1.1.3 Description:    Native Haskell TLS and SSL protocol implementation for server and client.    .@@ -37,8 +37,8 @@                    , cereal >= 0.3                    , bytestring                    , network-                   , crypto-random-api >= 0.2 && < 0.3-                   , crypto-pubkey+                   , crypto-random >= 0.0 && < 0.1+                   , crypto-pubkey >= 0.2                    , certificate >= 1.3.0 && < 1.4.0   Exposed-modules:   Network.TLS                      Network.TLS.Cipher@@ -87,13 +87,13 @@                    , QuickCheck >= 2                    , test-framework                    , test-framework-quickcheck2-                   , cprng-aes+                   , cprng-aes >= 0.5                    , crypto-pubkey                    , bytestring                    , certificate                    , tls                    , time-                   , crypto-random-api+                   , crypto-random >= 0.0.2 && < 0.1   ghc-options:       -Wall -fno-warn-orphans -fno-warn-missing-signatures  source-repository head