TLSv1.2 versions of OCSPOverflow probe

WestpointLtd · Aug 27, 2016 · fb3b084 · fb3b084
1 parent cc67454
commit fb3b084
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 0 deletions.
diff --git a/prober.py b/prober.py
@@ -129,6 +129,8 @@
     OCSPNull12(),
     OCSPNull12PFS(),
     OCSPOverflow(),
+    OCSPOverflow12(),
+    OCSPOverflow12PFS(),
     OCSPUnderflow(),
     DoubleExtension()
 ]

diff --git a/probes.py b/probes.py
@@ -1326,6 +1326,16 @@ def test(self, sock):
         sock.write(self.make_ocsp_hello('\x01\x00\x00\x00'))
 
 
+class OCSPOverflow12(OCSPOverflow, NormalHandshake12):
+    '''As with OCSPOverflow but in TLSv1.2 hello'''
+    pass
+
+
+class OCSPOverflow12PFS(OCSPOverflow, NormalHandshake12PFS):
+    '''As with OCSPOverflow but in PFS TLSv1.2 hello'''
+    pass
+
+
 class OCSPUnderflow(OCSPNull):
     '''Send status request ext larger than the length inside indicate'''
 

diff --git a/tests/test_probes.py b/tests/test_probes.py
@@ -2106,6 +2106,49 @@ def test_test(self):
                           b'\x01\x00\x00\x00'])
 
 
+class TestOCSPOverflow12(unittest.TestCase):
+    def test_test(self):
+        probe = OCSPOverflow12()
+        sock = MockSock()
+
+        probe.test(sock)
+
+        self.assertEqual(sock.sent_data,
+                         [b'\x16\x03\x01\x00['
+                          b'\x01\x00\x00W'
+                          b'\x03\x03' +
+                          RANDOM_STR +
+                          b'\x00'
+                          b'\x00&' +
+                          DEFAULT_12_CIPHERS_STR +
+                          b'\x01\x00'
+                          b'\x00\x08'
+                          b'\x00\x05\x00\x04'
+                          b'\x01\x00\x00\x00'])
+
+
+class TestOCSPOverflow12PFS(unittest.TestCase):
+    def test_test(self):
+        probe = OCSPOverflow12PFS()
+        sock = MockSock()
+
+        probe.test(sock)
+
+        self.maxDiff = None
+        self.assertEqual(sock.sent_data,
+                         [b"\x16\x03\x01\x00\x93"
+                          b"\x01\x00\x00\x8f"
+                          b"\x03\x03" +
+                          RANDOM_STR +
+                          b"\x00"
+                          b"\x00^" +
+                          DEFAULT_PFS_CIPHERS_STR +
+                          b"\x01\x00"
+                          b'\x00\x08'
+                          b'\x00\x05\x00\x04'
+                          b'\x01\x00\x00\x00'])
+
+
 class TestOCSPUnderflow(unittest.TestCase):
     def test_test(self):
         probe = OCSPUnderflow()