725b03a · typeable/wai

git.iko.soy/typeable/wai

Merge tag 'warp-tls/3.0.4.2'

commit725b03a2409cc863426e22c69a1cb84316cb902c authorMichael Snoyman <michael@snoyman.com> dateSun 21 Jun 2015, 06:48 (11 years ago) parent1fb5a31 eaa7eec

3 files changed+10−1

compare with master

unifiedsplit

warp-tls/ChangeLog.md+4 warp-tls/Network/Wai/Handler/WarpTLS.hs+5 warp-tls/warp-tls.cabal+1−1

warp-tls/ChangeLog.md+4

@@ -1,3 +1,7 @@

1+## 3.0.4.2

3+* tls 1.3 support [#390](https://github.com/yesodweb/wai/issues/390)

15## 3.0.4.1

37* Fix for leaked FDs [#378](https://github.com/yesodweb/wai/issues/378)

warp-tls/Network/Wai/Handler/WarpTLS.hs+5

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE OverloadedStrings #-}

23{-# LANGUAGE RankNTypes #-}

34{-# LANGUAGE RecordWildCards #-}

@@ -265,8 +266,12 @@ mkConn tlsset s params = do

265266

266267httpOverTls :: TLS.TLSParams params => TLSSettings -> Socket -> I.IORef B.ByteString -> params -> IO (Connection, Transport)

267268httpOverTls TLSSettings{..} s cachedRef params = do

269+#if MIN_VERSION_tls(1,3,0)

270+ ctx <- TLS.contextNew backend params

271+#else

268272 gen <- Crypto.Random.AESCtr.makeSystem

269273 ctx <- TLS.contextNew backend params gen

274+#endif

270275 TLS.contextHookSetLogging ctx tlsLogging

271276 TLS.handshake ctx

272277 writeBuf <- allocateBuffer bufferSize

warp-tls/warp-tls.cabal+1−1

@@ -1,5 +1,5 @@

11Name: warp-tls

2−Version: 3.0.4.1

2+Version: 3.0.4.2

33Synopsis: HTTP over SSL/TLS support for Warp via the TLS package

44License: MIT

55License-file: LICENSE