tls 1.3.6 → 1.3.7

raw patch · 7 files changed

+25/−15 lines, 7 filesdep ~mtl

Dependency ranges changed: mtl

Files

CHANGELOG.md +9/−0
Network/TLS/Extension.hs +1/−1
Network/TLS/Extra/Cipher.hs +2/−6
Network/TLS/Handshake/Process.hs +1/−1
Network/TLS/Handshake/Signature.hs +1/−0
Network/TLS/Imports.hs +9/−5
tls.cabal +2/−2

CHANGELOG.md view

@@ -1,3 +1,12 @@+## Version 1.3.7++- Disable SHA384 based cipher, as they don't work properly yet.++## Version 1.3.6++- Add new ciphers+- Improve some debugging and outputs+ ## Version 1.3.5  - Fix a bug with ECDHE based cipher where serialization

Network/TLS/Extension.hs view

@@ -41,7 +41,6 @@     , availableEllipticCurves     ) where -import Control.Applicative ((<$>),(<*>)) import Control.Monad  import Data.Word@@ -53,6 +52,7 @@ import Network.TLS.Extension.EC import Network.TLS.Struct (ExtensionID, EnumSafe8(..), EnumSafe16(..), HashAndSignatureAlgorithm) import Network.TLS.Wire+import Network.TLS.Imports import Network.TLS.Packet (putSignatureHashAlgorithm, getSignatureHashAlgorithm)  type HostName = String

Network/TLS/Extra/Cipher.hs view

@@ -139,9 +139,7 @@ -- this choice of ciphersuite should satisfy most normal need ciphersuite_all :: [Cipher] ciphersuite_all =-    [ cipher_ECDHE_RSA_AES256GCM_SHA384-    , cipher_ECDHE_RSA_AES128GCM_SHA256-    , cipher_ECDHE_RSA_AES256CBC_SHA384+    [ cipher_ECDHE_RSA_AES128GCM_SHA256     , cipher_ECDHE_RSA_AES256CBC_SHA     , cipher_ECDHE_ECDSA_AES128GCM_SHA256     , cipher_DHE_RSA_AES256_SHA256, cipher_DHE_RSA_AES128_SHA256@@ -161,9 +159,7 @@ -- | the strongest ciphers supported. ciphersuite_strong :: [Cipher] ciphersuite_strong =-    [ cipher_ECDHE_RSA_AES256GCM_SHA384-    , cipher_ECDHE_RSA_AES128GCM_SHA256-    , cipher_ECDHE_RSA_AES256CBC_SHA384+    [ cipher_ECDHE_RSA_AES128GCM_SHA256     , cipher_ECDHE_RSA_AES256CBC_SHA     , cipher_ECDHE_ECDSA_AES128GCM_SHA256     , cipher_DHE_RSA_AES256_SHA256

Network/TLS/Handshake/Process.hs view

@@ -13,7 +13,6 @@     , getHandshakeDigest     ) where -import Control.Applicative import Control.Concurrent.MVar import Control.Monad.State (gets) import Control.Monad@@ -27,6 +26,7 @@ import Network.TLS.State import Network.TLS.Context.Internal import Network.TLS.Crypto+import Network.TLS.Imports import Network.TLS.Handshake.State import Network.TLS.Handshake.Key import Network.TLS.Extension

Network/TLS/Handshake/Signature.hs view

@@ -79,6 +79,7 @@ signatureHashData SignatureRSA mhash =     case mhash of         Just HashSHA512 -> SHA512+        Just HashSHA384 -> SHA384         Just HashSHA256 -> SHA256         Just HashSHA1   -> SHA1         Nothing         -> SHA1_MD5

Network/TLS/Imports.hs view

@@ -5,22 +5,26 @@ -- Stability   : experimental -- Portability : unknown --+{-# LANGUAGE NoImplicitPrelude #-} module Network.TLS.Imports     (     -- generic exports-      module E+      Control.Applicative.Applicative(..)+    , (Control.Applicative.<$>)+    , Data.Monoid.Monoid(..)     -- project definition     , Bytes     , showBytesHex     ) where -import qualified Control.Applicative as E-import qualified Data.Monoid as E+import qualified Control.Applicative+import qualified Data.Monoid  import qualified Data.ByteString as B import           Data.ByteArray.Encoding as B+import qualified Prelude  type Bytes = B.ByteString -showBytesHex :: Bytes -> String-showBytesHex bs = show (B.convertToBase B.Base16 bs :: Bytes)+showBytesHex :: Bytes -> Prelude.String+showBytesHex bs = Prelude.show (B.convertToBase B.Base16 bs :: Bytes)

tls.cabal view

@@ -1,5 +1,5 @@ Name:                tls-Version:             1.3.6+Version:             1.3.7 Description:    Native Haskell TLS and SSL protocol implementation for server and client.    .@@ -41,7 +41,7 @@  Library   Build-Depends:     base >= 3 && < 5-                   , mtl+                   , mtl >= 2                    , transformers                    , cereal >= 0.4                    , bytestring