diff --git a/peyotls.cabal b/peyotls.cabal --- a/peyotls.cabal +++ b/peyotls.cabal @@ -2,7 +2,7 @@ cabal-version: >= 1.8 name: peyotls -version: 0.1.4.2 +version: 0.1.4.3 stability: Experimental author: Yoshikuni Jujo maintainer: Yoshikuni Jujo @@ -281,7 +281,7 @@ source-repository this type: git location: git://github.com/YoshikuniJujo/peyotls.git - tag: peyotls-0.1.4.2 + tag: peyotls-0.1.4.3 library hs-source-dirs: src diff --git a/src/Network/PeyoTLS/TChan/Client.hs b/src/Network/PeyoTLS/TChan/Client.hs --- a/src/Network/PeyoTLS/TChan/Client.hs +++ b/src/Network/PeyoTLS/TChan/Client.hs @@ -59,16 +59,13 @@ sn <- get modify succ pre <- lift $ hlGet h 3 --- liftBase $ print pre Right n <- B.decode <$> lift (hlGet h 2) enc <- lift $ hlGet h n --- liftBase $ print enc let hs = case rcs of AES_128_CBC_SHA -> sha1 AES_128_CBC_SHA256 -> sha256 _ -> error "Network.PeyoTLS.TChan.Client.open': bad" Right pln = decrypt hs rk rmk sn pre enc - liftBase $ putStrLn "" liftBase . atomically $ writeTChan inc pln return (inc, otc) @@ -105,15 +102,12 @@ sn <- get modify succ pre <- lift $ hlGet h 3 --- liftBase $ print pre Right n <- B.decode <$> lift (hlGet h 2) enc <- lift $ hlGet h n --- liftBase $ print enc let hs = case rcs of AES_128_CBC_SHA -> sha1 AES_128_CBC_SHA256 -> sha256 _ -> error "Network.PeyoTLS.TChan.Client.open': bad" Right pln = decrypt hs rk rmk sn pre enc - liftBase $ putStrLn "" liftBase . atomically $ writeTChan inc pln return (toCheckName ns, (inc, otc)) diff --git a/src/Network/PeyoTLS/TChan/Server.hs b/src/Network/PeyoTLS/TChan/Server.hs --- a/src/Network/PeyoTLS/TChan/Server.hs +++ b/src/Network/PeyoTLS/TChan/Server.hs @@ -47,13 +47,10 @@ . (`evalStateT` 1) . forever $ do sn <- get modify succ - liftBase $ putStrLn $ "sn = " ++ show sn pre <- lift $ hlGet h 3 when (BSC.null pre) $ lift (hlClose h) >> error "bad" --- liftBase $ print pre Right n <- B.decode <$> lift (hlGet h 2) --- liftBase $ print n renc <- lift $ hlGet h n let Right rpln = decrypt sha1 rk rmk sn pre renc liftBase $ do