Avoid repeatedly scanning the list of extensions

[openssl.git] / util / TLSProxy / Message.pm

diff --git a/util/TLSProxy/Message.pm b/util/TLSProxy/Message.pm
index 85d5d6bcd47353c92061cbe07af51649e5b0b524..4f07ee3d3fa8b63d6dd8f223ff4b53f0d61a0da3 100644 (file)
--- a/util/TLSProxy/Message.pm
+++ b/util/TLSProxy/Message.pm
@@ -17,6 +17,7 @@ use constant {
     MT_CLIENT_HELLO => 1,
     MT_SERVER_HELLO => 2,
     MT_NEW_SESSION_TICKET => 4,
     MT_CLIENT_HELLO => 1,
     MT_SERVER_HELLO => 2,
     MT_NEW_SESSION_TICKET => 4,

+    MT_ENCRYPTED_EXTENSIONS => 8,

     MT_CERTIFICATE => 11,
     MT_SERVER_KEY_EXCHANGE => 12,
     MT_CERTIFICATE_REQUEST => 13,
     MT_CERTIFICATE => 11,
     MT_SERVER_KEY_EXCHANGE => 12,
     MT_CERTIFICATE_REQUEST => 13,


@@ -36,7 +37,9 @@ use constant {
 
 #Alert descriptions
 use constant {
 
 #Alert descriptions
 use constant {

-    AL_DESC_CLOSE_NOTIFY => 0
+    AL_DESC_CLOSE_NOTIFY => 0,
+    AL_DESC_UNEXPECTED_MESSAGE => 10,
+    AL_DESC_NO_RENEGOTIATION => 100

 };
 
 my %message_type = (
 };
 
 my %message_type = (


@@ -44,6 +47,7 @@ my %message_type = (
     MT_CLIENT_HELLO, "ClientHello",
     MT_SERVER_HELLO, "ServerHello",
     MT_NEW_SESSION_TICKET, "NewSessionTicket",
     MT_CLIENT_HELLO, "ClientHello",
     MT_SERVER_HELLO, "ServerHello",
     MT_NEW_SESSION_TICKET, "NewSessionTicket",

+    MT_ENCRYPTED_EXTENSIONS, "EncryptedExtensions",

     MT_CERTIFICATE, "Certificate",
     MT_SERVER_KEY_EXCHANGE, "ServerKeyExchange",
     MT_CERTIFICATE_REQUEST, "CertificateRequest",
     MT_CERTIFICATE, "Certificate",
     MT_SERVER_KEY_EXCHANGE, "ServerKeyExchange",
     MT_CERTIFICATE_REQUEST, "CertificateRequest",


@@ -57,12 +61,16 @@ my %message_type = (
 
 use constant {
     EXT_STATUS_REQUEST => 5,
 
 use constant {
     EXT_STATUS_REQUEST => 5,

+    EXT_SUPPORTED_GROUPS => 10,

     EXT_ENCRYPT_THEN_MAC => 22,
     EXT_EXTENDED_MASTER_SECRET => 23,
     EXT_SESSION_TICKET => 35,
     EXT_ENCRYPT_THEN_MAC => 22,
     EXT_EXTENDED_MASTER_SECRET => 23,
     EXT_SESSION_TICKET => 35,

-    # This extension does not exist and isn't recognised by OpenSSL.
-    # We use it to test handling of duplicate extensions.
-    EXT_DUPLICATE_EXTENSION => 1234
+    EXT_SUPPORTED_VERSIONS => 43,
+    EXT_KEY_SHARE => 40,
+    # This extension is an unofficial extension only ever written by OpenSSL
+    # (i.e. not read), and even then only when enabled. We use it to test
+    # handling of duplicate extensions.
+    EXT_DUPLICATE_EXTENSION => 0xfde8

 };
 
 my $payload = "";
 };
 
 my $payload = "";


@@ -110,9 +118,9 @@ sub get_messages
             die "CCS received before message data complete\n";
         }
         if ($server) {
             die "CCS received before message data complete\n";
         }
         if ($server) {

-            TLSProxy::Record->server_ccs_seen(1);
+            TLSProxy::Record->server_encrypting(1);

         } else {
         } else {

-            TLSProxy::Record->client_ccs_seen(1);
+            TLSProxy::Record->client_encrypting(1);

         }
     } elsif ($record->content_type == TLSProxy::Record::RT_HANDSHAKE) {
         if ($record->len == 0 || $record->len_real == 0) {
         }
     } elsif ($record->content_type == TLSProxy::Record::RT_HANDSHAKE) {
         if ($record->len == 0 || $record->len_real == 0) {


@@ -197,14 +205,14 @@ sub get_messages
         print "  [".$record->decrypt_data."]\n";
     } elsif ($record->content_type == TLSProxy::Record::RT_ALERT) {
         my ($alertlev, $alertdesc) = unpack('CC', $record->decrypt_data);
         print "  [".$record->decrypt_data."]\n";
     } elsif ($record->content_type == TLSProxy::Record::RT_ALERT) {
         my ($alertlev, $alertdesc) = unpack('CC', $record->decrypt_data);

-        #All alerts end the test
-        $end = 1;

         #A CloseNotify from the client indicates we have finished successfully
         #(we assume)
         #A CloseNotify from the client indicates we have finished successfully
         #(we assume)

-        if (!$server && $alertlev == AL_LEVEL_WARN
+        if (!$end && !$server && $alertlev == AL_LEVEL_WARN

             && $alertdesc == AL_DESC_CLOSE_NOTIFY) {
             $success = 1;
         }
             && $alertdesc == AL_DESC_CLOSE_NOTIFY) {
             $success = 1;
         }

+        #All alerts end the test
+        $end = 1;

     }
 
     return @messages;
     }
 
     return @messages;