Skip to content

Commit

Permalink
TLSv1.2 versions of TrustedCANull probe
Browse files Browse the repository at this point in the history
  • Loading branch information
tomato42 committed Aug 27, 2016
1 parent b619ebe commit 9e6214d
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 0 deletions.
2 changes: 2 additions & 0 deletions prober.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@
ClientCertURLsNotNull12(),
ClientCertURLsNotNull12PFS(),
TrustedCANull(),
TrustedCANull12(),
TrustedCANull12PFS(),
TrustedCAOverflow(),
TrustedCAUnderflow(),
TruncatedHMACNotNull(),
Expand Down
10 changes: 10 additions & 0 deletions probes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1203,6 +1203,16 @@ def test(self, sock):
sock.write(self.make_trusted_ca_hello(''))


class TrustedCANull12(TrustedCANull, NormalHandshake12):
'''As with TrustedCANull but in TLSv1.2 hello'''
pass


class TrustedCANull12PFS(TrustedCANull, NormalHandshake12PFS):
'''As with TrustedCANull, but in PFS TLSv1.2 hello'''
pass


class TrustedCAOverflow(TrustedCANull):
'''Send trusted CA keys extension smaller than length inside indicates'''

Expand Down
41 changes: 41 additions & 0 deletions tests/test_probes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1789,6 +1789,47 @@ def test_test(self):
b'\x00\x03\x00\x00'])


class TestTrustedCANull12(unittest.TestCase):
def test_test(self):
probe = TrustedCANull12()
sock = MockSock()

probe.test(sock)

self.assertEqual(sock.sent_data,
[b'\x16\x03\x01\x00W'
b'\x01\x00\x00S'
b'\x03\x03' +
RANDOM_STR +
b'\x00'
b'\x00&' +
DEFAULT_12_CIPHERS_STR +
b'\x01\x00'
b'\x00\x04'
b'\x00\x03\x00\x00'])


class TestTrustedCANull12PFS(unittest.TestCase):
def test_test(self):
probe = TrustedCANull12PFS()
sock = MockSock()

probe.test(sock)

self.maxDiff = None
self.assertEqual(sock.sent_data,
[b"\x16\x03\x01\x00\x8f"
b"\x01\x00\x00\x8b"
b"\x03\x03" +
RANDOM_STR +
b"\x00"
b"\x00^" +
DEFAULT_PFS_CIPHERS_STR +
b"\x01\x00"
b'\x00\x04'
b'\x00\x03\x00\x00'])


class TestTrustedCAOverflow(unittest.TestCase):
def test_test(self):
probe = TrustedCAOverflow()
Expand Down

0 comments on commit 9e6214d

Please sign in to comment.