Browse Source

update to tls >= 1.1.3

master
Philipp Balzarek 12 years ago
parent
commit
a00d155739
  1. 6
      pontarius-xmpp.cabal
  2. 6
      source/Network/Xmpp/Tls.hs

6
pontarius-xmpp.cabal

@ -47,7 +47,7 @@ Library @@ -47,7 +47,7 @@ Library
, conduit >=1.0.1
, containers >=0.4.0.0
, crypto-api >=0.9
, crypto-random-api >=0.2
, crypto-random >=0.0.5
, cryptohash >=0.6.1
, cryptohash-cryptoapi >=0.1
, data-default >=0.2
@ -64,8 +64,8 @@ Library @@ -64,8 +64,8 @@ Library
, stm >=2.1.2.1
, stringprep >=0.1.3
, text >=0.11.1.5
, tls >=1.1.0
, tls-extra >=0.5.0
, tls >=1.1.3
, tls-extra >=0.6.0
, transformers >=0.2.2.0
, void >=0.5.5
, xml-types >=0.3.1

6
source/Network/Xmpp/Tls.hs

@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
{-# OPTIONS_HADDOCK hide #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE PackageImports #-}
module Network.Xmpp.Tls where
import Control.Applicative ((<$>))
import qualified Control.Exception.Lifted as Ex
import Control.Monad
import Control.Monad.Error
import Control.Monad.State.Strict
import Crypto.Random.API
import "crypto-random" Crypto.Random
import qualified Data.ByteString as BS
import qualified Data.ByteString.Char8 as BSC8
import qualified Data.ByteString.Lazy as BL
@ -121,7 +123,7 @@ tlsinit :: (MonadIO m, MonadIO m1) => @@ -121,7 +123,7 @@ tlsinit :: (MonadIO m, MonadIO m1) =>
)
tlsinit params backend = do
liftIO $ debugM "Pontarius.Xmpp.Tls" "TLS with debug mode enabled."
gen <- liftIO $ getSystemRandomGen -- TODO: Find better random source?
gen <- liftIO (cprgCreate <$> createEntropyPool :: IO SystemRNG)
con <- client params gen backend
handshake con
let src = forever $ do

Loading…
Cancel
Save