Update dependencies

Former-commit-id: 07be9bcd252c92551aeac5c658f92f74243105e1 Former-commit-id: b341e9cf83887e8916850743b19530e2ae62bedc [formerly b0dd237c1af7232c65504086f32c543e2969f21c] [formerly 5f84fe76bfaf2ea3150d2524b2d8df3bcc202b42 [formerly df2a945ea4f815d78825bbd6eb47355fa7862146 [formerly df2a945ea4f815d78825bbd6eb47355fa7862146 [formerly df2a945ea4f815d78825bbd6eb47355fa7862146 [formerly f3baa2138e3ecd75e07adaa8e8390e0d1d3eeed6]]]]] Former-commit-id: 5a12d3b8f84beb6967fd2273700830e11a919dcb [formerly 23f65ae564b717c82f4f878bebcfb23696470c28] Former-commit-id: c2dda31dea3d0634127eb6fb4b2557d41c8ee442 Former-commit-id: 886a28263ded5e3f13a642e8739eb4f83c0615f3 Former-commit-id: 937d535ef551e00fe83c69c16f715cd71ebda6dd Former-commit-id: 4aae739c2c9a054011d743112ab937f750c179c2 [formerly 6a87e7206c043684e0f0c5acf8d83cd5bcfb6014] Former-commit-id: 58fbcd0de59b4c8ff87286b9b61e90425df334bb
2019-10-24 13:46:58 +02:00 · 2019-10-24 13:46:58 +02:00 · e3c9462b6b
commit e3c9462b6b
parent 72e6b0df4f
6 changed files with 35 additions and 28 deletions
--- a/src/Credentials.hs
+++ b/src/Credentials.hs
@ -4,32 +4,41 @@ module Credentials where

 import           ClassyPrelude

-- openssl genrsa 512 > host.key
+-- openssl genrsa 1024 > host.key
 -- openssl req -new -x509 -nodes -sha1 -days 9999 -key host.key > host.cert
 key :: ByteString
 key = "-----BEGIN RSA PRIVATE KEY-----\n" <>
-  "MIIBOgIBAAJBAMEEloIcF3sTGYhQmybyDm1NOpXmf94rR1fOwENjuW6jh4WTaz5k\n" <>
-  "Uew8CR58e7c5GgK08ZOJwi2Hpl9MfDm4mGUCAwEAAQJAGP+nHqLUx7PpkqYd8iVX\n" <>
-  "iQB/nfqEhRnF27GDZTb9RT7e3bR7X1B9oIBnpmqwMG5oPxidoIKv+jzZjsQcxKLu\n" <>
-  "4QIhAPdcPmFrtLUpTXx21wtVxotsO7+YcQxtRtBoXeiREUInAiEAx8Jx9a6eVRIh\n" <>
-  "slSTJMPuy/LbvK8VUTqtx9x2EhFhBJMCIQC68qlmwZs6y/N3HO4b8AD1gKCLhm/y\n" <>
-  "P2ikvCw1R+ZuQwIgdfcgMUPzgK16dMN5OabzaEF8/kouvo92fKZ2m2jj8D0CIFY8\n" <>
-  "4SkXDkpeUEKKfxHqrEkkxmpRk93Ui1NPyN+wxrgO\n" <>
+  "MIICXAIBAAKBgQCzP4dg89HDyWfe2k5KD8RdFNh7G9Rla8cjMtE6ccBx84B1WbG5\n" <>
+  "ziRpaCvsTdYSVRwcbR07+4oqR302vyCBZ+r/djpYuTyUTNRYC9+h4wdPGXKhKpeR\n" <>
+  "z1BNVKCsQ6qcBFLDb7l6ra+g36DMQuLcJvLx7LX7elW5w9M/I4FFfV+aeQIDAQAB\n" <>
+  "AoGAD744qa9AcS2zTcNmtOKFoJdAHC/pi67XoqPH9JYhDOESGzxxe5w7XnajxPFh\n" <>
+  "J+MJwQVkV+xTyjrVKIXI2RTDct6tdG2jDcH6P0Xf3I6BPBhvw9pLlisUHTqVxFpV\n" <>
+  "nAoUiyWYZcEiF37IT/uwdRAlhqgitjK7rhZfkM2XNpMb3gECQQDp1qpVk4y5smFE\n" <>
+  "IfZPr94paBZLRD9EwHnxZVM27oR0C95YIgcc12mNchYxIOW4szKwyaUCZLafiojA\n" <>
+  "+anojR/RAkEAxDxnn/3qWmHGYrs/1wrT9FEoC6XZGBHboQIcYYGihK/64P8E19WF\n" <>
+  "BmexzLZdlilieT0ATM5I9zOULSiZ4H/iKQJAC46PdpFHSDo3sm1XRhL0EOnTCD9E\n" <>
+  "PTqiDDssxK8/HpkjkQmFfnhrABGeZSkyEVHR9IjSve6KVBI9tgPg0NyAsQJAEZB+\n" <>
+  "jfmCQnjB8xBjlHHpqtKgzPoZRmhCylSQCcI6s7m0sPLikhcQgxRA+9vO4KPvpn5p\n" <>
+  "SnakXUwGlUwvCcMokQJBAKw9U5H88GyB4qWhnwhustnVnVg/bzkYGpryjDx6mLYh\n" <>
+  "eMPlv6aH546XMJbQ6fRe3tgMBBgOD1QN9WvKuFQo2K4=\n" <>
  "-----END RSA PRIVATE KEY-----"

 certificate :: ByteString
 certificate = "-----BEGIN CERTIFICATE-----\n" <>
-  "MIICXTCCAgegAwIBAgIJAJf1Sm7DI0KcMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD\n" <>
-  "VQQGEwJGUjESMBAGA1UECAwJQXF1aXRhaW5lMRAwDgYDVQQHDAdCYXlvbm5lMQ4w\n" <>
-  "DAYDVQQKDAVFcmViZTELMAkGA1UECwwCSVQxFjAUBgNVBAMMDXJvbWFpbi5nZXJh\n" <>
-  "cmQxHzAdBgkqhkiG9w0BCQEWEHdoeW5vdEBnbWFpbC5jb20wHhcNMTYwNTIxMTUy\n" <>
-  "MzIyWhcNNDMxMDA2MTUyMzIyWjCBiTELMAkGA1UEBhMCRlIxEjAQBgNVBAgMCUFx\n" <>
-  "dWl0YWluZTEQMA4GA1UEBwwHQmF5b25uZTEOMAwGA1UECgwFRXJlYmUxCzAJBgNV\n" <>
-  "BAsMAklUMRYwFAYDVQQDDA1yb21haW4uZ2VyYXJkMR8wHQYJKoZIhvcNAQkBFhB3\n" <>
-  "aHlub3RAZ21haWwuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMEEloIcF3sT\n" <>
-  "GYhQmybyDm1NOpXmf94rR1fOwENjuW6jh4WTaz5kUew8CR58e7c5GgK08ZOJwi2H\n" <>
-  "pl9MfDm4mGUCAwEAAaNQME4wHQYDVR0OBBYEFLY0HsQst1t3QRXU0aTWg3V1IvGX\n" <>
-  "MB8GA1UdIwQYMBaAFLY0HsQst1t3QRXU0aTWg3V1IvGXMAwGA1UdEwQFMAMBAf8w\n" <>
-  "DQYJKoZIhvcNAQEFBQADQQCP4oYOIrX7xvmQih3hvF4kUnbKjtttImdGruonsLAz\n" <>
-  "OL2VExC6OqlDP2yu14BlsjTt+X2v6mhHnSM16c6AkpM/\n" <>
+  "MIIC5DCCAk2gAwIBAgIUBjMRJwxK4qoz64RFZcHQorbfrucwDQYJKoZIhvcNAQEF\n" <>
+  "BQAwgYMxCzAJBgNVBAYTAkZSMRIwEAYDVQQIDAlBcXVpdGFpbmUxETAPBgNVBAcM\n" <>
+  "CEd1ZXRoYXJ5MRMwEQYDVQQKDApFcmViZSBDb3JwMRIwEAYDVQQLDAlIYWNrIEhh\n" <>
+  "Y2sxDjAMBgNVBAMMBWVyZWJlMRQwEgYJKoZIhvcNAQkBFgVlcmViZTAeFw0xOTEw\n" <>
+  "MjQxMTM5NDVaFw00NzAzMTAxMTM5NDVaMIGDMQswCQYDVQQGEwJGUjESMBAGA1UE\n" <>
+  "CAwJQXF1aXRhaW5lMREwDwYDVQQHDAhHdWV0aGFyeTETMBEGA1UECgwKRXJlYmUg\n" <>
+  "Q29ycDESMBAGA1UECwwJSGFjayBIYWNrMQ4wDAYDVQQDDAVlcmViZTEUMBIGCSqG\n" <>
+  "SIb3DQEJARYFZXJlYmUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALM/h2Dz\n" <>
+  "0cPJZ97aTkoPxF0U2Hsb1GVrxyMy0TpxwHHzgHVZsbnOJGloK+xN1hJVHBxtHTv7\n" <>
+  "iipHfTa/IIFn6v92Oli5PJRM1FgL36HjB08ZcqEql5HPUE1UoKxDqpwEUsNvuXqt\n" <>
+  "r6DfoMxC4twm8vHstft6VbnD0z8jgUV9X5p5AgMBAAGjUzBRMB0GA1UdDgQWBBRC\n" <>
+  "8mpWQdiOTYy+GBxUQ9vssIloMTAfBgNVHSMEGDAWgBRC8mpWQdiOTYy+GBxUQ9vs\n" <>
+  "sIloMTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAGkUgoDLmb5e\n" <>
+  "SWPR61QEByPkIji4DytJfzUeJBZKyRQSMGC08yUAPAmFbIt1jqBO6nTum3TjlV6S\n" <>
+  "7bv3kEhkgTdoKHyWtBitnR2wg90Ybm4K6OKLnoKZgvl1IZ6x8LCqI1RVIQMHaUkL\n" <>
+  "L3+otPXxpH1LXGnikOlwLkF2LPhRmX9X\n" <>
  "-----END CERTIFICATE-----"
--- a/src/HttpProxy.hs
+++ b/src/HttpProxy.hs
@ -13,7 +13,6 @@ import qualified Data.ByteString.Char8     as BC
 import           Control.Monad.Except
 import qualified Data.Conduit.Network.TLS  as N
 import qualified Data.Streaming.Network    as N
-import           System.Timeout

 import qualified Data.ByteString.Base64    as B64
 import           Network.Socket            (HostName, PortNumber)
--- a/src/Protocols.hs
+++ b/src/Protocols.hs
@ -6,8 +6,7 @@ module Protocols where
 import           ClassyPrelude
 import           Control.Concurrent        (forkIO)
 import qualified Data.HashMap.Strict       as H
-import           System.Timeout            (timeout)
-import           System.IO
+import           System.IO                 hiding (hSetBuffering, hGetBuffering)

 import qualified Data.ByteString.Char8     as BC

--- a/src/Tunnel.hs
+++ b/src/Tunnel.hs
@ -27,7 +27,6 @@ import qualified Network.WebSockets.Stream     as WS
 import           Control.Monad.Except
 import qualified Network.Connection            as NC
 import           System.IO                     (IOMode (ReadWriteMode))
-import           System.Timeout

 import qualified Data.ByteString.Base64        as B64

--- a/src/Types.hs
+++ b/src/Types.hs
@ -12,7 +12,8 @@ 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                (HostName, PortNumber(..))
+import           Network.Socket.Internal       (PortNumber(..))
 import qualified Network.Socket                as N hiding (recv, recvFrom,
                                                     send, sendTo)
 import qualified Network.Socket.ByteString     as N
--- a/stack.yaml
+++ b/stack.yaml
@ -15,7 +15,7 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-9.9
+resolver: lts-14.11

 # User packages to be built.
 # Various formats can be used as shown in the example below.
@ -35,7 +35,7 @@ packages:
 # Dependency packages to be pulled from upstream that are not in the resolver
 # using the same syntax as the packages field.
 # (e.g., acme-missiles-0.3)
-extra-deps: [ websockets-0.12.4.1 ]
+extra-deps: [ ]

 # Override default flag values for local packages and extra-deps
 # flags: {}