hex/wstunnel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Support for TLS 1.3

Browse source 
Former-commit-id: a137a97a2eee198af224f649d9a583965d19d7d4
Former-commit-id: 9959e6c092824cb6cda2e1a34d998a051921f54d [formerly 21db0555fa62a1417c32e2643b3930fbfbf782b0] [formerly 2b3c3465fb9d6de01f47ff1452a28d177f89f69c [formerly b5a72adeed14fa5186f7ec79c99234823eb53f06 [formerly b5a72adeed14fa5186f7ec79c99234823eb53f06 [formerly b5a72adeed14fa5186f7ec79c99234823eb53f06 [formerly 237d793fffe4ce05b8a0dd2490a6132b3fcf132e]]]]]
Former-commit-id: a6b5c1678673619a1f3a9cfcc226426e153b6596 [formerly 25a9a41fba724314423baa06e69eddec385bd29b]
Former-commit-id: c4fa74f3f3ac613787b0379d7c85c8341666f9e6
Former-commit-id: 4d0ecb4badf6ade0f8db7f09c6a005ece7818f83
Former-commit-id: 361f8af56bef5f164ab0b5391097d891fb15c99c
Former-commit-id: 19e1adbbec30af852428168ac7c1f6bce569e8ec [formerly bd6215392e7e581fe2c9efc8bfd4ed24c69368d7]
Former-commit-id: 7d968b29d1e39c0d2b0a7ff4651bf2b6e87592a2
This commit is contained in:
Romain GERARD 2020-07-12 12:38:24 +02:00
parent c7c061fea7
commit c30796dde0
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Types.hs
View file

@ -13,8 +13,7 @@ import Data.ByteString (hGetSome, hPutStr)
import qualified Data.Streaming.Network as N
import qualified Network.Connection as NC
import Network.Socket (HostName, PortNumber(..))
import Network.Socket.Internal (PortNumber(..))
import Network.Socket (HostName, PortNumber)
import qualified Network.Socket as N hiding (recv, recvFrom,
send, sendTo)
import qualified Network.Socket.ByteString as N
@ -22,11 +21,14 @@ import qualified Network.Socket.ByteString as N
import qualified Network.WebSockets.Connection as WS
import System.IO.Unsafe (unsafeDupablePerformIO)
deriving instance Generic PortNumber
deriving instance Hashable PortNumber
instance Hashable PortNumber where
hashWithSalt s p = hashWithSalt s (fromEnum p)
deriving instance Generic N.SockAddr
deriving instance Hashable N.SockAddr
{-# NOINLINE defaultRecvBufferSize #-}
defaultRecvBufferSize :: Int
defaultRecvBufferSize = unsafeDupablePerformIO $

2
stack.yaml
View file

@ -15,7 +15,7 @@
# resolver:
# name: custom-snapshot
# location: "./custom-snapshot.yaml"
resolver: lts-14.11
resolver: lts-16.4
# User packages to be built.
# Various formats can be used as shown in the example below.

4
wstunnel.cabal
View file

@ -26,7 +26,7 @@ library
, connection
, hslogger
, mtl
, network < 3.0.0.0
, network
, network-conduit-tls
, streaming-commons
, text >= 1.2.2.1
@ -46,7 +46,7 @@ test-suite wstunnel-test
, text >= 1.2.2.1
, classy-prelude
, bytestring
, network < 3.0.0.0
, network
, network-conduit-tls
, streaming-commons
, wstunnel