git.iko.soy/typeable/wai
on master help sign in
warp-tls: newer tls
commit05198ceaca388e94badb80bced1124ccc9120f79 authorMichael Snoyman <michael@snoyman.com> dateWed 8 Feb 2012, 10:17 (15 years ago) parent499bbf2
3 files changed+9−11
compare with master
unifiedsplit
warp-tls/Network/Wai/Handler/WarpTLS.hs+2−5 warp-tls/pong.hs+3−2 warp-tls/warp-tls.cabal+4−4
warp-tls/Network/Wai/Handler/WarpTLS.hs+2−5
@@ -19,9 +19,7 @@ import qualified Network.TLS.Extra as TLSExtra
1919import qualified Data.Certificate.X509 as X509
2020import qualified Data.Certificate.PEM as PEM
2121import qualified Data.ByteString as B
22−import Control.Monad (unless)
2322import qualified Data.Certificate.KeyRSA as KeyRSA
24−import Control.Applicative ((<$>))
2523
2624data TLSSettings = TLSSettings
2725 { certFile :: FilePath
@@ -53,8 +51,7 @@ runTLS tset set app = do
5351 hSetBuffering h NoBuffering
5452 gen <- newGenIO
5553 ctx <- TLS.server params (gen :: SystemRandom) h
56− b <- TLS.handshake ctx
57− unless b $ error "Invalid handshake"
54+ TLS.handshake ctx
5855 let conn = Connection
5956 { connSendMany = TLS.sendData ctx . L.fromChunks
6057 , connSendAll = TLS.sendData ctx . L.fromChunks . return
@@ -62,7 +59,7 @@ runTLS tset set app = do
6259 , connClose = do
6360 TLS.bye ctx
6461 hClose h
65− , connRecv = B.concat . L.toChunks <$> TLS.recvData ctx
62+ , connRecv = TLS.recvData ctx
6663 }
6764 return (conn, sa)
6865
warp-tls/pong.hs+3−2
@@ -5,6 +5,7 @@ import Network.Wai.Handler.WarpTLS
55import Network.HTTP.Types (status200)
66import Blaze.ByteString.Builder (copyByteString)
77import Data.Monoid
8+import qualified Data.Conduit as C
89import qualified Data.Conduit.List as CL
910
1011main = do
@@ -39,13 +40,13 @@ sourceWithLen = ResponseSource
3940 [ ("Content-Type", "text/plain")
4041 , ("Content-Length", "4")
4142 ]
42− $ CL.sourceList [copyByteString "PONG"]
43+ $ CL.sourceList [C.Chunk $ copyByteString "PONG"]
4344
4445sourceNoLen = ResponseSource
4546 status200
4647 [ ("Content-Type", "text/plain")
4748 ]
48− $ CL.sourceList [copyByteString "PONG"]
49+ $ CL.sourceList [C.Chunk $ copyByteString "PONG"]
4950
5051fileWithLen = ResponseFile
5152 status200
warp-tls/warp-tls.cabal+4−4
@@ -1,5 +1,5 @@
11Name: warp-tls
2−Version: 1.1.0
2+Version: 1.1.1
33Synopsis: SSL support for Warp via the TLS package
44License: BSD3
55License-file: LICENSE
@@ -19,10 +19,10 @@ Library
1919 , warp >= 1.1 && < 1.2
2020 , transformers >= 0.2 && < 0.3
2121 , conduit >= 0.2
22− , certificate >= 1.0.1 && < 1.1
22+ , certificate >= 1.1 && < 1.2
2323 , cryptocipher >= 0.3 && < 0.4
24− , tls-extra >= 0.4 && < 0.5
25− , tls >= 0.8.1 && < 0.9
24+ , tls-extra >= 0.4.3 && < 0.5
25+ , tls >= 0.9 && < 0.10
2626 , crypto-api >= 0.8 && < 0.10
2727 , network >= 2.2.1 && < 2.4
2828 Exposed-modules: Network.Wai.Handler.WarpTLS