Address code review feedback

1 files changed, 18 insertions, 3 deletions

diff --git a/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp b/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp
index e4cf06f6631..2d203047835 100644
--- a/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp
+++ b/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp
@@ -3,7 +3,7 @@
 #include <vespa/vespalib/net/tls/protocol_snooping.h>
 
 using namespace vespalib;
-using namespace vespalib::net::tls;
+using namespace vespalib::net::tls::snooping;
 
 TEST("min_header_bytes_to_observe() is 8") {
     EXPECT_EQUAL(8u, min_header_bytes_to_observe());
@@ -28,9 +28,14 @@ TEST("Mismatching handshake header byte 1 returns HandshakeMismatch") {
     EXPECT_EQUAL(TlsSnoopingResult::HandshakeMismatch, do_snoop(buf));
 }
 
-TEST("Mismatching handshake header byte 2 returns HandshakeMismatch") {
+TEST("Mismatching major version byte returns ProtocolVersionMismatch") {
     const unsigned char buf[] = { 22, 2, 1, 10, 255, 1, 0, 10 };
-    EXPECT_EQUAL(TlsSnoopingResult::HandshakeMismatch, do_snoop(buf));
+    EXPECT_EQUAL(TlsSnoopingResult::ProtocolVersionMismatch, do_snoop(buf));
+}
+
+TEST("Mismatching minor version byte returns ProtocolVersionMismatch") {
+    const unsigned char buf[] = { 22, 3, 0, 10, 255, 1, 0, 10 };
+    EXPECT_EQUAL(TlsSnoopingResult::ProtocolVersionMismatch, do_snoop(buf));
 }
 
 TEST("Oversized record returns RecordSizeRfcViolation") {
@@ -42,6 +47,11 @@ TEST("Oversized record returns RecordSizeRfcViolation") {
     EXPECT_EQUAL(TlsSnoopingResult::RecordSizeRfcViolation, do_snoop(buf2));
 }
 
+TEST("Undersized record returns RecordSizeRfcViolation") {
+    const unsigned char buf1[] = { 22, 3, 1, 0, 3, 1, 0, 0 };
+    EXPECT_EQUAL(TlsSnoopingResult::RecordSizeRfcViolation, do_snoop(buf1));
+}
+
 TEST("Non-ClientHello handshake record returns RecordNotClientHello") {
     const unsigned char buf[] = { 22, 3, 1, 10, 255, 2, 0, 10 };
     //                                               ^ 1 == ClientHello
@@ -60,4 +70,9 @@ TEST("Expected ClientHello record size mismatch returns ExpectedRecordSizeMismat
     EXPECT_EQUAL(TlsSnoopingResult::ExpectedRecordSizeMismatch, do_snoop(buf));
 }
 
+TEST("Valid ClientHello record size with LSB < 4 returns ProbablyTls") {
+    const unsigned char buf[] = { 22, 3, 1, 10, 3, 1, 0, 9 };
+    EXPECT_EQUAL(TlsSnoopingResult::ProbablyTls, do_snoop(buf));
+}
+
 TEST_MAIN() { TEST_RUN_ALL(); }