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.

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

Jump to bottom

Add old CHACHA20-POLY1305 related cipher suites to the list #383

Merged
merged 1 commit into from
Nov 26, 2017
Merged

Add old CHACHA20-POLY1305 related cipher suites to the list #383

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions dpkt/ssl_ciphersuites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,12 @@ def block_size(self):
CipherSuite(0xc0af, 'ECDHE', 'ECDSA ', 'AES_256 ', 'CCM_8', ''),

# Unassigned: 0xc0b0-0xcca7
CipherSuite(0xcc13, 'ECDHE', 'RSA ', 'CHACHA20', 'POLY1305', 'SHA256',
'OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256'),
CipherSuite(0xcc14, 'ECDHE', 'ECDSA ', 'CHACHA20', 'POLY1305', 'SHA256',
'OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256'),
CipherSuite(0xcc15, 'DHE ', 'RSA ', 'CHACHA20', 'POLY1305', 'SHA256',
'OLD_TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256'),

# RFC7905
CipherSuite(0xcca8, 'ECDHE', 'RSA ', 'CHACHA20', 'POLY1305', 'SHA256'),
Expand Down Expand Up @@ -578,6 +584,7 @@ def test_kx(self):
assert (BY_CODE[0xc09d].kx == 'RSA')
assert (BY_CODE[0xc0a2].kx == 'DHE')
assert (BY_CODE[0xc0ad].kx == 'ECDHE')
assert (BY_CODE[0xcc13].kx == 'ECDHE')
assert (BY_CODE[0xcca8].kx == 'ECDHE')
assert (BY_CODE[0xccae].kx == 'RSA')

Expand Down Expand Up @@ -609,6 +616,7 @@ def test_auth(self):
assert (BY_CODE[0xc09d].auth == 'RSA')
assert (BY_CODE[0xc0a2].auth == 'RSA')
assert (BY_CODE[0xc0ad].auth == 'ECDSA')
assert (BY_CODE[0xcc14].auth == 'ECDSA')
assert (BY_CODE[0xcca8].auth == 'RSA')
assert (BY_CODE[0xccae].auth == 'PSK')

Expand Down Expand Up @@ -648,4 +656,5 @@ def test_name(self):
assert (BY_CODE[0xc0ad].name == 'TLS_ECDHE_ECDSA_WITH_AES_256_CCM')
assert (BY_CODE[0xcca8].name == 'TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256')
assert (BY_CODE[0xccae].name == 'TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256')
assert (BY_CODE[0xcc15].name == 'OLD_TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256')