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

Enable X448 and FFDHE groups #401

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
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ server name indication: 127.0.0.1

## TLS 1.3 HelloRetryRequest (HRR)

The default value of `-g` is `x448,x25519,p256`. To trigger HRR, omit the `-g` option. The first value is only used for key-share.
The first value of `-g` is used for key-share. To trigger HRR, add in first
position a value which will not be accepted by the server, for example use
`ffdhe2048,x25519,p256`.

```
% tls-simpleclient --tls13 -v --no-valid -O html-log.txt --http1.1 127.0.0.1 443
% tls-simpleclient --tls13 -v --no-valid -O html-log.txt --http1.1 -g ffdhe2048,x25519,p256 127.0.0.1 443
sending query:
GET / HTTP/1.1
Host: 127.0.0.1
Expand Down
8 changes: 3 additions & 5 deletions core/Network/TLS/Parameters.hs
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,8 @@ data Supported = Supported
-- extension. It is used in both clients and servers to restrict
-- accepted groups in DH key exchange.
--
-- The default value is ['X25519','P256','P384','P521'].
-- 'X25519' and 'P256' provide 128-bit security which is strong
-- enough until 2030. Both curves are fast because their
-- backends are written in C.
-- The default value includes all groups with security strength of 128
-- bits or more.
, supportedGroups :: [Group]
} deriving (Show,Eq)

Expand Down Expand Up @@ -261,7 +259,7 @@ defaultSupported = Supported
, supportedSession = True
, supportedFallbackScsv = True
, supportedEmptyPacket = True
, supportedGroups = [X25519,P256,P384,P521]
, supportedGroups = [X25519,X448,P256,FFDHE3072,FFDHE4096,P384,FFDHE6144,FFDHE8192,P521]
}

instance Default Supported where
Expand Down