tls-debug 0.4.2 → 0.4.3

raw patch · 3 files changed

+18/−17 lines, 3 filesdep ~tls

Dependency ranges changed: tls

Files

• src/SimpleClient.hs +3/−1
• src/SimpleServer.hs +13/−14
• tls-debug.cabal +2/−2

@@ -42,6 +42,8 @@     , cipher_RC4_128_SHA1     , cipher_RSA_3DES_EDE_CBC_SHA1     , cipher_DHE_RSA_AES128GCM_SHA256+    , cipher_ECDHE_RSA_AES256GCM_SHA384+    , cipher_ECDHE_RSA_AES256CBC_SHA     , cipher_ECDHE_RSA_AES128GCM_SHA256     , cipher_ECDHE_ECDSA_AES128GCM_SHA256     ]@@ -122,7 +124,7 @@                     l  -> cipherID c `elem` l              getDebugSeed :: Maybe Seed -> Flag -> Maybe Seed-            getDebugSeed _   (DebugSeed seed) = seedFromInteger <$> readNumber seed+            getDebugSeed _   (DebugSeed seed) = seedFromInteger `fmap` readNumber seed             getDebugSeed acc _                = acc              tlsConnectVer

@@ -2,7 +2,7 @@ {-# LANGUAGE ScopedTypeVariables #-} import Crypto.Random import Network.BSD-import Network.Socket (socket, Family(..), SocketType(..), sClose, SockAddr(..), bind, listen, accept)+import Network.Socket (socket, Family(..), SocketType(..), sClose, SockAddr(..), bind, listen, accept, iNADDR_ANY) import Network.TLS import Network.TLS.Extra.Cipher import System.Console.GetOpt@@ -50,10 +50,9 @@  bogusCipher cid = cipher_AES128_SHA1 { cipherID = cid } -runTLS debug ioDebug params hostname portNumber f = do-    he   <- getHostByName hostname+runTLS debug ioDebug params portNumber f = do     sock <- socket AF_INET Stream defaultProtocol-    let sockaddr = SockAddrInet portNumber (head $ hostAddresses he)+    let sockaddr = SockAddrInet portNumber iNADDR_ANY      bind sock sockaddr     listen sock 1@@ -86,8 +85,8 @@     , sessionInvalidate = \_         -> return ()     } -getDefaultParams :: [Flag] -> String -> CertificateStore -> IORef (SessionID, SessionData) -> Credential -> Maybe (SessionID, SessionData) -> ServerParams-getDefaultParams flags host store sStorage cred session =+getDefaultParams :: [Flag] -> CertificateStore -> IORef (SessionID, SessionData) -> Credential -> Maybe (SessionID, SessionData) -> ServerParams+getDefaultParams flags store sStorage cred session =     ServerParams         { serverWantClientCert = False         , serverCACertificates = []@@ -130,7 +129,7 @@                     l  -> cipherID c `elem` l              getDebugSeed :: Maybe Seed -> Flag -> Maybe Seed-            getDebugSeed _   (DebugSeed seed) = seedFromInteger <$> readNumber seed+            getDebugSeed _   (DebugSeed seed) = seedFromInteger `fmap` readNumber seed             getDebugSeed acc _                = acc              tlsConnectVer@@ -205,7 +204,7 @@ loadCred _       Nothing =     error "missing credential certificate" -runOn (sStorage, certStore) flags port hostname+runOn (sStorage, certStore) flags port     | BenchSend `elem` flags = runBench True     | BenchRecv `elem` flags = runBench False     | otherwise              = do@@ -218,7 +217,7 @@         runBench isSend = do             cred <- loadCred getKey getCertificate             runTLS False False-                   (getDefaultParams flags hostname certStore sStorage cred noSession) hostname port $ \ctx -> do+                   (getDefaultParams flags certStore sStorage cred noSession) port $ \ctx -> do                 handshake ctx                 if isSend                     then loopSendData getBenchAmount ctx@@ -245,7 +244,7 @@              runTLS (Debug `elem` flags)                    (IODebug `elem` flags)-                   (getDefaultParams flags hostname certStore sStorage cred sess) hostname port $ \ctx -> do+                   (getDefaultParams flags certStore sStorage cred sess) port $ \ctx -> do                 handshake ctx                 loopRecv out ctx                 --sendData ctx $ query@@ -299,7 +298,7 @@     | otherwise     = Nothing  printUsage =-    putStrLn $ usageInfo "usage: simpleclient [opts] <hostname> [port]\n\n\t(port default to: 443)\noptions:\n" options+    putStrLn $ usageInfo "usage: simpleserver [opts] [port]\n\n\t(port default to: 443)\noptions:\n" options  printCiphers = do     putStrLn "Supported ciphers"@@ -329,6 +328,6 @@     certStore <- getSystemCertificateStore     sStorage  <- newIORef (error "storage ioref undefined")     case other of-        [hostname]      -> runOn (sStorage, certStore) opts 443 hostname-        [hostname,port] -> runOn (sStorage, certStore) opts (fromInteger $ read port) hostname-        _               -> printUsage >> exitFailure+        []     -> runOn (sStorage, certStore) opts 443+        [port] -> runOn (sStorage, certStore) opts (fromInteger $ read port)+        _      -> printUsage >> exitFailure

@@ -1,5 +1,5 @@ Name:                tls-debug-Version:             0.4.2+Version:             0.4.3 Description:    A set of program to test and debug various aspect of the TLS package.    .@@ -69,7 +69,7 @@                    , data-default-class                    , cryptonite >= 0.14                    , x509-system >= 1.0-                   , tls >= 1.3 && < 1.4+                   , tls >= 1.3.6 && < 1.4   Buildable:         True   ghc-options:       -Wall -fno-warn-missing-signatures