Skip to content

Commit

Permalink
Merge branch 'master' of github.com:TomMD/crypto-api
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas M. DuBuisson committed Sep 12, 2014
2 parents 7f08ce2 + 092c509 commit d884b5a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Crypto/Classes.hs
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ getIV g =
| otherwise -> Left (GenErrorOther "Generator failed to provide requested number of bytes")
{-# INLINEABLE getIV #-}

-- | Obtain an 'IV' using the system entropy (see 'System.Crypto.Random')
-- | Obtain an 'IV' using the system entropy (see 'System.Entropy')
getIVIO :: (BlockCipher k) => IO (IV k)
getIVIO = do
let p = Proxy
Expand Down Expand Up @@ -457,7 +457,7 @@ blockSizeBytes = fmap (`div` 8) blockSize
keyLengthBytes :: (BlockCipher k) => Tagged k ByteLength
keyLengthBytes = fmap (`div` 8) keyLength

-- |Build a symmetric key using the system entropy (see 'System.Crypto.Random')
-- |Build a symmetric key using the system entropy (see 'System.Entropy')
buildKeyIO :: (BlockCipher k) => IO k
buildKeyIO = buildKeyM getEntropy fail

Expand Down
4 changes: 2 additions & 2 deletions Crypto/Random.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This module is for instantiating cryptographicly strong
determinitic random bit generators (DRBGs, aka PRNGs) For the simple
use case of using the system random number generator
('System.Crypto.Random') to seed the DRBG:
('System.Entropy') to seed the DRBG:
@ g <- newGenIO
@
Expand Down Expand Up @@ -160,7 +160,7 @@ class CryptoRandomGen g where
-- (`NotEnoughEntropy`).
reseed :: B.ByteString -> g -> Either GenError g

-- |By default this uses "System.Crypto.Random" to obtain
-- |By default this uses "System.Entropy" to obtain
-- entropy for `newGen`.
newGenIO :: IO g
newGenIO = go 0
Expand Down

0 comments on commit d884b5a

Please sign in to comment.