git.iko.soy/typeable/wai
on master help sign in
Merge pull request #162 from alephcloud/master

Using RNG from cprng-aes in order to be more economic with OS entropy

commit068439d253db13e9192246c37795983a516717f1 authorMichael Snoyman <michael@snoyman.com> dateTue 4 Jun 2013, 03:59 (13 years ago) parent8d0158c23ac840
2 files changed+3−2
compare with master
unifiedsplit
warp-tls/Network/Wai/Handler/WarpTLS.hs+2−2 warp-tls/warp-tls.cabal+1
warp-tls/Network/Wai/Handler/WarpTLS.hs+2−2
@@ -42,7 +42,7 @@ import qualified Data.PEM as PEM
4242import Data.Conduit.Network (sourceSocket, sinkSocket, acceptSafe)
4343import Data.Maybe (fromMaybe)
4444import qualified Data.IORef as I
45−import Crypto.Random.API (getSystemRandomGen)
45+import Crypto.Random.AESCtr (makeSystem)
4646import Control.Exception (Exception, throwIO)
4747import Data.Typeable (Typeable)
4848import qualified Data.Conduit.Binary as CB
@@ -117,7 +117,7 @@ runTLSSocket TLSSettings {..} set sock app = do
117117 return bs
118118 if maybe False ((== 0x16) . fst) (firstBS >>= B.uncons)
119119 then do
120− gen <- getSystemRandomGen
120+ gen <- makeSystem
121121 ctx <- TLS.contextNew
122122 TLS.Backend
123123 { TLS.backendFlush = return ()
warp-tls/warp-tls.cabal+1
@@ -27,6 +27,7 @@ Library
2727 , tls >= 1.1
2828 , crypto-random-api >= 0.2
2929 , network >= 2.2.1
30+ , cprng-aes >= 0.3.4
3031 Exposed-modules: Network.Wai.Handler.WarpTLS
3132 ghc-options: -Wall
3233