Skip to content

upgrade tls #1620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

upgrade tls #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e7aea9
upgrade tls
epoberezkin Sep 2, 2025
5ab13ad
upgrade tls package to 2.1.8
epoberezkin Sep 2, 2025
b47b3ad
2.1.6
epoberezkin Sep 2, 2025
55be4fa
Merge branch 'master' into ep/upgrade-hackage
epoberezkin Sep 2, 2025
be7340f
Merge branch 'master' into ep/upgrade-hackage
epoberezkin Sep 7, 2025
9ff8c48
test 2.1.11
epoberezkin Sep 7, 2025
cdd2edb
bisecting tls 2.1.6-2.1.7
epoberezkin Sep 7, 2025
cb69832
Merge branch 'master' into ep/upgrade-hackage
epoberezkin Sep 7, 2025
a3e8228
Merge branch 'master' into ep/upgrade-hackage
epoberezkin Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages: .
-- coverage: False
-- library-coverage: False

index-state: 2023-12-12T00:00:00Z
index-state: 2025-07-01T00:00:00Z

package cryptostore
flags: +use_crypton
Expand Down Expand Up @@ -51,3 +51,11 @@ source-repository-package
location: https://github.com/simplex-chat/wai.git
tag: 2f6e5aa5f05ba9140ac99e195ee647b4f7d926b0
subdir: warp

source-repository-package
type: git
location: https://github.com/haskell-tls/hs-tls.git
tag: 7f060799ea762c5d7ff058d264dae5f0294fac79
-- passes 7f060799ea762c5d7ff058d264dae5f0294fac79
-- fails 1927590272ada1e0a32c29ca29ae9cc8d5ed3595
subdir: tls
4 changes: 2 additions & 2 deletions simplexmq.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ library
, composition ==1.0.*
, constraints >=0.12 && <0.14
, containers ==0.6.*
, crypton ==0.34.*
, crypton ==1.0.*
, crypton-x509 ==1.7.*
, crypton-x509-store ==1.6.*
, crypton-x509-validation ==1.6.*
Expand All @@ -320,7 +320,7 @@ library
, stm ==2.5.*
, time ==1.12.*
, time-manager ==0.0.*
, tls >=1.9.0 && <1.10
, tls ==2.1.6.*
, transformers ==0.6.*
, unliftio ==0.2.*
, unliftio-core ==0.2.*
Expand Down
3 changes: 2 additions & 1 deletion src/Simplex/Messaging/Transport.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ import GHC.IO.Handle.Internals (ioe_EOF)
import Network.Socket
import qualified Network.TLS as T
import qualified Network.TLS.Extra as TE
import qualified Network.TLS.Internal as TI
import qualified Paths_simplexmq as SMQ
import qualified Simplex.Messaging.Crypto as C
import Simplex.Messaging.Encoding
Expand Down Expand Up @@ -369,7 +370,7 @@ getTLS cfg tlsCertSent tlsPeerCert cxt = withTlsUnique @TLS @p cxt newTLS
withTlsUnique :: forall c p. TransportPeerI p => T.Context -> (ByteString -> IO (c p)) -> IO (c p)
withTlsUnique cxt f =
cxtFinished cxt
>>= maybe (closeTLS cxt >> ioe_EOF) f
>>= maybe (closeTLS cxt >> ioe_EOF) (\(TI.VerifyData d) -> f d)
where
cxtFinished = case sTransportPeer @p of
STServer -> T.getPeerFinished
Expand Down
Loading