From a71c6b815c2d0fc0445175f348fbbe5deea2888a Mon Sep 17 00:00:00 2001
From: Philipp Balzarek <p.balzarek@googlemail.com>
Date: Wed, 14 Nov 2012 16:39:28 +0100
Subject: [PATCH] fix TLS code for hs-tls 1.0

---
 source/Data/Conduit/TLS.hs | 7 ++++++-
 source/Network/Xmpp/TLS.hs | 5 +----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/Data/Conduit/TLS.hs b/source/Data/Conduit/TLS.hs
index 33224c1..2dbdb28 100644
--- a/source/Data/Conduit/TLS.hs
+++ b/source/Data/Conduit/TLS.hs
@@ -23,13 +23,18 @@ import Network.TLS.Extra as TLSExtra
 
 import System.IO(Handle)
 
+client params gen handle = do
+    contextNewOnHandle handle params gen
+
+defaultParams = defaultParamsClient
+
 tlsinit :: (MonadIO m, MonadIO m1) =>
         Bool
      -> TLSParams
      -> Handle -> m ( Source m1 BS.ByteString
                     , Sink BS.ByteString m1 ()
                     , BS.ByteString -> IO ()
-                    , TLSCtx Handle
+                    , Context
                     )
 tlsinit debug tlsParams handle = do
     when debug . liftIO $ putStrLn "TLS with debug mode enabled"
diff --git a/source/Network/Xmpp/TLS.hs b/source/Network/Xmpp/TLS.hs
index cdf151c..7c1c2ec 100644
--- a/source/Network/Xmpp/TLS.hs
+++ b/source/Network/Xmpp/TLS.hs
@@ -21,15 +21,12 @@ starttlsE :: Element
 starttlsE = Element "{urn:ietf:params:xml:ns:xmpp-tls}starttls" [] []
 
 exampleParams :: TLS.TLSParams
-exampleParams = TLS.defaultParams
+exampleParams = TLS.defaultParamsClient
     { pConnectVersion    = TLS.TLS10
     , pAllowedVersions   = [TLS.SSL3, TLS.TLS10, TLS.TLS11]
     , pCiphers           = [TLS.cipher_AES128_SHA1]
     , pCompressions      = [TLS.nullCompression]
-    , pWantClientCert    = False -- Used for servers
     , pUseSecureRenegotiation = False -- No renegotiation
-    , pCertificates      = [] -- TODO
-    , pLogging           = TLS.defaultLogging -- TODO
     , onCertificatesRecv = \_certificate ->
           return TLS.CertificateUsageAccept
     }