haskell/cryptonite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Proxy in openBackend

Browse Source 
Replaces 'undefined' and fixes #198.
This commit is contained in:
Olivier Chéron 2017-10-23 20:39:00 +02:00
parent 4ef50d8092
commit 4723dc0b39
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Crypto/Random/Entropy/Backend.hs
View File

@ -15,6 +15,7 @@ module Crypto.Random.Entropy.Backend
import Foreign.Ptr import Foreign.Ptr
import Data.Word (Word8) import Data.Word (Word8)
import Crypto.Internal.Proxy
import Crypto.Random.Entropy.Source import Crypto.Random.Entropy.Source
#ifdef SUPPORT_RDRAND #ifdef SUPPORT_RDRAND
import Crypto.Random.Entropy.RDRand import Crypto.Random.Entropy.RDRand
@ -30,12 +31,12 @@ supportedBackends :: [IO (Maybe EntropyBackend)]
supportedBackends = supportedBackends =
[ [
#ifdef SUPPORT_RDRAND #ifdef SUPPORT_RDRAND
openBackend (undefined :: RDRand), openBackend (Proxy :: Proxy RDRand),
#endif #endif
#ifdef WINDOWS #ifdef WINDOWS
openBackend (undefined :: WinCryptoAPI) openBackend (Proxy :: Proxy WinCryptoAPI)
#else #else
openBackend (undefined :: DevRandom), openBackend (undefined :: DevURandom) openBackend (Proxy :: Proxy DevRandom), openBackend (Proxy :: Proxy DevURandom)
#endif #endif
] ]
@ -43,9 +44,9 @@ supportedBackends =
data EntropyBackend = forall b . EntropySource b => EntropyBackend b data EntropyBackend = forall b . EntropySource b => EntropyBackend b
-- | Open a backend handle -- | Open a backend handle
openBackend :: EntropySource b => b -> IO (Maybe EntropyBackend) openBackend :: EntropySource b => Proxy b -> IO (Maybe EntropyBackend)
openBackend b = fmap EntropyBackend `fmap` callOpen b openBackend b = fmap EntropyBackend `fmap` callOpen b
where callOpen :: EntropySource b => b -> IO (Maybe b) where callOpen :: EntropySource b => Proxy b -> IO (Maybe b)
callOpen _ = entropyOpen callOpen _ = entropyOpen
-- | Gather randomness from an open handle -- | Gather randomness from an open handle