Browse Source

Fix TLS build problem

master
Jon Kristensen 11 years ago
parent
commit
faeda19744
  1. 4
      pontarius-xmpp.cabal
  2. 9
      source/Network/Xmpp/Tls.hs

4
pontarius-xmpp.cabal

@ -1,5 +1,5 @@
Name: pontarius-xmpp Name: pontarius-xmpp
Version: 0.4.2.1 Version: 0.4.2.2
Cabal-Version: >= 1.9.2 Cabal-Version: >= 1.9.2
Build-Type: Custom Build-Type: Custom
License: BSD3 License: BSD3
@ -210,4 +210,4 @@ Source-Repository head
Source-Repository this Source-Repository this
Type: git Type: git
Location: git://github.com/pontarius/pontarius-xmpp.git Location: git://github.com/pontarius/pontarius-xmpp.git
Tag: 0.4.0.2 Tag: 0.4.2.2

9
source/Network/Xmpp/Tls.hs

@ -110,9 +110,8 @@ tls con = fmap join -- We can have Left values both from exceptions and the
modify (\s -> s{streamConnectionState = Secured}) modify (\s -> s{streamConnectionState = Secured})
return () return ()
client :: (MonadIO m, CPRG rng) => ClientParams -> rng -> Backend -> m Context client :: MonadIO m => ClientParams -> Backend -> m Context
client params gen backend = do client params backend = contextNew backend params
contextNew backend params gen
tlsinit :: (MonadIO m, MonadIO m1) => tlsinit :: (MonadIO m, MonadIO m1) =>
ClientParams ClientParams
@ -125,12 +124,12 @@ tlsinit :: (MonadIO m, MonadIO m1) =>
) )
tlsinit params backend = do tlsinit params backend = do
liftIO $ debugM "Pontarius.Xmpp.Tls" "TLS with debug mode enabled." liftIO $ debugM "Pontarius.Xmpp.Tls" "TLS with debug mode enabled."
gen <- liftIO (cprgCreate <$> createEntropyPool :: IO SystemRNG) -- gen <- liftIO (cprgCreate <$> createEntropyPool :: IO SystemRNG)
sysCStore <- liftIO getSystemCertificateStore sysCStore <- liftIO getSystemCertificateStore
let params' = params{clientShared = let params' = params{clientShared =
(clientShared params){ sharedCAStore = (clientShared params){ sharedCAStore =
sysCStore <> sharedCAStore (clientShared params)}} sysCStore <> sharedCAStore (clientShared params)}}
con <- client params' gen backend con <- client params' backend
handshake con handshake con
let src = forever $ do let src = forever $ do
dt <- liftIO $ recvData con dt <- liftIO $ recvData con

Loading…
Cancel
Save