Skip to content
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.

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

Expose TLS.supportedHashSignatures via TLSSettings #872

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions warp-tls/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 3.3.3

* Expose TLS.supportedHashSignatures via TLSSettings
[#872](https://github.com/yesodweb/wai/pull/872)

## 3.3.2

* Providing the Internal module.
Expand Down
2 changes: 2 additions & 0 deletions warp-tls/Network/Wai/Handler/WarpTLS.hs
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ defaultTlsSettings = TLSSettings {
, tlsSessionManagerConfig = Nothing
, tlsCredentials = Nothing
, tlsSessionManager = Nothing
, tlsSupportedHashSignatures = TLS.supportedHashSignatures def
}

-- taken from stunnel example in tls-extra
Expand Down Expand Up @@ -256,6 +257,7 @@ runTLSSocket' tlsset@TLSSettings{..} set credentials mgr sock app =
, TLS.supportedClientInitiatedRenegotiation = False
, TLS.supportedSession = True
, TLS.supportedFallbackScsv = True
, TLS.supportedHashSignatures = tlsSupportedHashSignatures
#if MIN_VERSION_tls(1,5,0)
, TLS.supportedGroups = [TLS.X25519,TLS.P256,TLS.P384]
#endif
Expand Down
5 changes: 5 additions & 0 deletions warp-tls/Network/Wai/Handler/WarpTLS/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ data TLSSettings = TLSSettings {
-- specified, 'tlsSessionManagerConfig' is ignored.
--
-- Since 3.2.12
, tlsSupportedHashSignatures :: [TLS.HashAndSignatureAlgorithm]
-- ^ Specifying supported hash/signature algorithms, ordered by decreasing
-- priority. See the "Network.TLS" module for details
--
-- Since 3.3.3
}


Expand Down