Browse Source

fix TLS code for hs-tls 1.0

master
Philipp Balzarek 13 years ago
parent
commit
a71c6b815c
  1. 7
      source/Data/Conduit/TLS.hs
  2. 5
      source/Network/Xmpp/TLS.hs

7
source/Data/Conduit/TLS.hs

@ -23,13 +23,18 @@ import Network.TLS.Extra as TLSExtra
import System.IO(Handle) import System.IO(Handle)
client params gen handle = do
contextNewOnHandle handle params gen
defaultParams = defaultParamsClient
tlsinit :: (MonadIO m, MonadIO m1) => tlsinit :: (MonadIO m, MonadIO m1) =>
Bool Bool
-> TLSParams -> TLSParams
-> Handle -> m ( Source m1 BS.ByteString -> Handle -> m ( Source m1 BS.ByteString
, Sink BS.ByteString m1 () , Sink BS.ByteString m1 ()
, BS.ByteString -> IO () , BS.ByteString -> IO ()
, TLSCtx Handle , Context
) )
tlsinit debug tlsParams handle = do tlsinit debug tlsParams handle = do
when debug . liftIO $ putStrLn "TLS with debug mode enabled" when debug . liftIO $ putStrLn "TLS with debug mode enabled"

5
source/Network/Xmpp/TLS.hs

@ -21,15 +21,12 @@ starttlsE :: Element
starttlsE = Element "{urn:ietf:params:xml:ns:xmpp-tls}starttls" [] [] starttlsE = Element "{urn:ietf:params:xml:ns:xmpp-tls}starttls" [] []
exampleParams :: TLS.TLSParams exampleParams :: TLS.TLSParams
exampleParams = TLS.defaultParams exampleParams = TLS.defaultParamsClient
{ pConnectVersion = TLS.TLS10 { pConnectVersion = TLS.TLS10
, pAllowedVersions = [TLS.SSL3, TLS.TLS10, TLS.TLS11] , pAllowedVersions = [TLS.SSL3, TLS.TLS10, TLS.TLS11]
, pCiphers = [TLS.cipher_AES128_SHA1] , pCiphers = [TLS.cipher_AES128_SHA1]
, pCompressions = [TLS.nullCompression] , pCompressions = [TLS.nullCompression]
, pWantClientCert = False -- Used for servers
, pUseSecureRenegotiation = False -- No renegotiation , pUseSecureRenegotiation = False -- No renegotiation
, pCertificates = [] -- TODO
, pLogging = TLS.defaultLogging -- TODO
, onCertificatesRecv = \_certificate -> , onCertificatesRecv = \_certificate ->
return TLS.CertificateUsageAccept return TLS.CertificateUsageAccept
} }

Loading…
Cancel
Save