preparing for tls v2.1

yesodweb · Jun 25, 2024 · 26f1d18 · 26f1d18
1 parent d50e118
commit 26f1d18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/warp-tls/Network/Wai/Handler/WarpTLS.hs b/warp-tls/Network/Wai/Handler/WarpTLS.hs
@@ -444,8 +444,8 @@ getTLSinfo ctx = do
     minfo <- TLS.contextGetInformation ctx
     case minfo of
         Nothing -> return TCP
-        Just TLS.Information{..} -> do
-            let (major, minor) = case infoVersion of
+        Just info -> do
+            let (major, minor) = case TLS.infoVersion info of
                     TLS.SSL2 -> (2, 0)
                     TLS.SSL3 -> (3, 0)
                     TLS.TLS10 -> (3, 1)
@@ -458,7 +458,7 @@ getTLSinfo ctx = do
                     { tlsMajorVersion = major
                     , tlsMinorVersion = minor
                     , tlsNegotiatedProtocol = proto
-                    , tlsChiperID = TLS.cipherID infoCipher
+                    , tlsChiperID = TLS.cipherID $ TLS.infoCipher info
                     , tlsClientCertificate = clientCert
                     }
 

diff --git a/warp-tls/warp-tls.cabal b/warp-tls/warp-tls.cabal
@@ -23,7 +23,7 @@ Library
                    , wai                           >= 3.2      && < 3.3
                    , warp                          >= 3.3.29   && < 3.5
                    , data-default-class            >= 0.0.1
-                   , tls                           >= 1.7
+                   , tls                           >= 1.7      && < 2.2
                    , network                       >= 2.2.1
                    , streaming-commons
                    , tls-session-manager           >= 0.0.4