]> woffs.de Git - fd/haskell-amqp-utils.git/commitdiff
Revert "tls version compat"
authorFrank Doepper <[email protected]>
Tue, 10 Jul 2018 20:20:47 +0000 (22:20 +0200)
committerFrank Doepper <[email protected]>
Tue, 10 Jul 2018 20:20:47 +0000 (22:20 +0200)
This reverts commit 6b6f879b56d9b21e42245a29ecbfd30c695b54a9.

Network/AMQP/Utils/Connection.hs
amqp-utils.cabal

index 30c5c25d7a524741e0321f6693dcd0bb2c548aaa..2cde3774fcd8c6c8043adf5926beafd357d21236 100644 (file)
@@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedStrings, CPP #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Network.AMQP.Utils.Connection where
 
@@ -29,15 +29,7 @@ connect args = do
                   { sharedValidationCache = def
                   , sharedCAStore = globalCertificateStore
                   }
-            , clientSupported =
-                def
-                  { supportedCiphers =
-#if MIN_VERSION_tls(1,3,9)
-                      ciphersuite_default
-#else
-                      ciphersuite_all
-#endif
-                  }
+            , clientSupported = def {supportedCiphers = ciphersuite_default}
             , clientHooks =
                 def {onCertificateRequest = myCert (cert args) (key args)}
             }
index 21dff2b0302c75f94c973c666964346a5fff213c..fe4b1949e569514e0dfbf63b6fbf210a8e2056ad 100644 (file)
@@ -42,11 +42,11 @@ executable konsum
                        process,
                        bytestring,
                        x509-system,
-                       tls,
+                       tls >= 1.3.9,
                        amqp >=0.17
   
   ghc-options:         -threaded -Wall
-
+  
   default-language:    Haskell98
 
   other-modules:       Network.AMQP.Utils.Options,
@@ -65,7 +65,7 @@ executable agitprop
                        process,
                        bytestring,
                        x509-system,
-                       tls,
+                       tls >= 1.3.9,
                        amqp >=0.17,
                        unix >= 2.7,
                        hinotify >= 0.3.8,
don't click here