on master help sign in
Fix a security regression
commit8d0158cf6443630e6870073d50879d8a19e21ea0 authorMichael Snoyman <michael@snoyman.com> dateMon 3 Jun 2013, 19:44 (13 years ago) parent46029b4
2 files changed+4−4
warp-tls/Network/Wai/Handler/WarpTLS.hs+3−3 warp-tls/warp-tls.cabal+1−1
warp-tls/Network/Wai/Handler/WarpTLS.hs+3−3
@@ -93,7 +93,6 @@ runTLSSocket :: TLSSettings -> Settings -> Socket -> Application -> IO ()
9393runTLSSocket TLSSettings {..} set sock app = do
9494 certs <- readCertificates certFile
9595 pk <- readPrivateKey keyFile
96− gen <- getSystemRandomGen
9796 let params =
9897 TLS.updateServerParams
9998 (\sp -> sp { TLS.serverWantClientCert = False }) $
@@ -103,9 +102,9 @@ runTLSSocket TLSSettings {..} set sock app = do
103102 , TLS.pCertificates = zip certs $ (Just pk):repeat Nothing
104103 , TLS.pLogging = tlsLogging
105104 }
106− runSettingsConnectionMaker set (getter gen params) app
105+ runSettingsConnectionMaker set (getter params) app
107106 where
108− getter gen params = do
107+ getter params = do
109108 (s, sa) <- acceptSafe sock
110109 let mkConn = do
111110 (fromClient, firstBS) <- sourceSocket s C.$$+ CL.peek
@@ -118,6 +117,7 @@ runTLSSocket TLSSettings {..} set sock app = do
118117 return bs
119118 if maybe False ((== 0x16) . fst) (firstBS >>= B.uncons)
120119 then do
120+ gen <- getSystemRandomGen
121121 ctx <- TLS.contextNew
122122 TLS.Backend
123123 { TLS.backendFlush = return ()
warp-tls/warp-tls.cabal+1−1
@@ -1,5 +1,5 @@
11Name: warp-tls
2−Version: 1.4.1.1
2+Version: 1.4.1.2
33Synopsis: HTTP over SSL/TLS support for Warp via the TLS package
44License: MIT
55License-file: LICENSE