Skip to content

Commit

Permalink
Correct kx and au for PSK_DHE
Browse files Browse the repository at this point in the history
RFC6655[1] actually has a typo in the name of its ciphersuites, it states
that they use DHE_PSK (accurate) but wrote it PSK_DHE in the name of the
ciphersuites 0xc0aa and 0xc0ab. There is an errata for it [2]. So the kex
is actually DHE and the authentication PSK.

[1]: https://datatracker.ietf.org/doc/html/rfc6655#section-4
[2]: https://www.rfc-editor.org/errata_search.php?rfc=6655&eid=3987
  • Loading branch information
benoit-sb authored and chifflier committed Jan 21, 2025
1 parent 7c725d6 commit b82bd69
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scripts/extract-iana-ciphers2.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def getCiphers():
'ECDHE_PSK': ['ECDHE', 'PSK'],
'ECDHE_RSA': ['ECDHE', 'RSA'],
'PSK': ['PSK', 'PSK'],
'PSK_DHE': ['PSK', 'DHE'],
'PSK_DHE': ['DHE', 'PSK'],
'KRB5': ['KRB5', 'KRB5'],
'KRB5_EXPORT': ['KRB5', 'KRB5'],
'RSA_EXPORT': ['RSA', 'RSA'],
Expand Down
4 changes: 2 additions & 2 deletions scripts/tls-ciphersuites.txt
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@ c0a6:TLS_DHE_PSK_WITH_AES_128_CCM:DHE:PSK:AES:CCM:128:AEAD:128:DEFAULT:0:rfc6655
c0a7:TLS_DHE_PSK_WITH_AES_256_CCM:DHE:PSK:AES:CCM:256:AEAD:256:DEFAULT:0:rfc6655:0:0300:ffff
c0a8:TLS_PSK_WITH_AES_128_CCM_8:PSK:PSK:AES:CCM:128:AEAD:128:DEFAULT:0:rfc6655:0:0300:ffff
c0a9:TLS_PSK_WITH_AES_256_CCM_8:PSK:PSK:AES:CCM:256:AEAD:256:DEFAULT:0:rfc6655:0:0300:ffff
c0aa:TLS_PSK_DHE_WITH_AES_128_CCM_8:PSK:DHE:AES:CCM:128:AEAD:128:DEFAULT:0:rfc6655:0:0300:ffff
c0ab:TLS_PSK_DHE_WITH_AES_256_CCM_8:PSK:DHE:AES:CCM:256:AEAD:256:DEFAULT:0:rfc6655:0:0300:ffff
c0aa:TLS_PSK_DHE_WITH_AES_128_CCM_8:DHE:PSK:AES:CCM:128:AEAD:128:DEFAULT:0:rfc6655:0:0300:ffff
c0ab:TLS_PSK_DHE_WITH_AES_256_CCM_8:DHE:PSK:AES:CCM:256:AEAD:256:DEFAULT:0:rfc6655:0:0300:ffff
c0ac:TLS_ECDHE_ECDSA_WITH_AES_128_CCM:ECDHE:ECDSA:AES:CCM:128:AEAD:128:DEFAULT:0:rfc7251:0:0300:ffff
c0ad:TLS_ECDHE_ECDSA_WITH_AES_256_CCM:ECDHE:ECDSA:AES:CCM:256:AEAD:256:DEFAULT:0:rfc7251:0:0300:ffff
c0ae:TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:ECDHE:ECDSA:AES:CCM:128:AEAD:128:DEFAULT:0:rfc7251:0:0300:ffff
Expand Down

0 comments on commit b82bd69

Please sign in to comment.