git.iko.soy/typeable/wai
on master help sign in
tls 1.1.3
commit0a342defca5ba1d6d0146e67b93e8bfdc642bbf8 authorMichael Snoyman <michael@snoyman.com> dateSun 1 Sep 2013, 19:09 (13 years ago) parenteaa2374
2 files changed+17
compare with master
unifiedsplit
warp-tls/Network/Wai/Handler/WarpTLS.hs+8 warp-tls/warp-tls.cabal+9
warp-tls/Network/Wai/Handler/WarpTLS.hs+8
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE OverloadedStrings #-}
23{-# LANGUAGE RankNTypes #-}
34{-# LANGUAGE RecordWildCards #-}
@@ -46,6 +47,9 @@ import Crypto.Random.AESCtr (makeSystem)
4647import Control.Exception (Exception, throwIO)
4748import Data.Typeable (Typeable)
4849import qualified Data.Conduit.Binary as CB
50+#if MIN_VERSION_tls(1, 1, 3)
51+import qualified Crypto.Random.AESCtr
52+#endif
4953
5054data TLSSettings = TLSSettings
5155 { certFile :: FilePath
@@ -117,7 +121,11 @@ runTLSSocket TLSSettings {..} set sock app = do
117121 return bs
118122 if maybe False ((== 0x16) . fst) (firstBS >>= B.uncons)
119123 then do
124+#if MIN_VERSION_tls(1, 1, 3)
125+ gen <- Crypto.Random.AESCtr.makeSystem
126+#else
120127 gen <- makeSystem
128+#endif
121129 ctx <- TLS.contextNew
122130 TLS.Backend
123131 { TLS.backendFlush = return ()
warp-tls/warp-tls.cabal+9
@@ -12,6 +12,9 @@ Cabal-Version: >=1.6
1212Stability: Stable
1313Description: HTTP over SSL/TLS support for Warp via the TLS package.
1414
15+flag tls_1_1_3
16+ default: True
17+
1518Library
1619 Build-Depends: base >= 4 && < 5
1720 , bytestring >= 0.9
@@ -28,6 +31,12 @@ Library
2831 , crypto-random-api >= 0.2
2932 , network >= 2.2.1
3033 , cprng-aes >= 0.3.4
34+ if flag(tls_1_1_3)
35+ build-depends: tls >= 1.1.3
36+ , cprng-aes >= 0.5.0
37+ else
38+ build-depends: tls < 1.1.3
39+ , cprng-aes < 0.5.0
3140 Exposed-modules: Network.Wai.Handler.WarpTLS
3241 ghc-options: -Wall
3342