Commit f50306c2 authored by Matt Caswell's avatar Matt Caswell
Browse files

Merge common code between test_tls13messages and test_sslmessages 



Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich
Salz

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 6ca94f10

test/recipes/70-test_sslmessages.t

+123 −160
Original line number Diff line number Diff line
@@ -7,11 +7,21 @@ 
# https://www.openssl.org/source/license.html



use strict;

use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file bldtop_dir/;

use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file srctop_dir bldtop_dir/;

use OpenSSL::Test::Utils;

use File::Temp qw(tempfile);

use TLSProxy::Proxy;

my $test_name = "test_tls13messages";



# This block needs to run before 'use lib srctop_dir' directives.

BEGIN {

    OpenSSL::Test::setup("no_test_here");

}



use lib srctop_dir("test", "recipes");



use recipes::checkhandshake qw(checkhandshake @handmessages @extensions);



my $test_name = "test_sslmessages";

setup($test_name);



plan skip_all => "TLSProxy isn't usable on $^O"
@@ -28,77 +38,6 @@ plan skip_all => "$test_name needs TLS enabled" 


$ENV{OPENSSL_ia32cap} = '~0x200000200000000';



use constant {

    DEFAULT_HANDSHAKE => 1,

    OCSP_HANDSHAKE => 2,

    RESUME_HANDSHAKE => 4,

    CLIENT_AUTH_HANDSHAKE => 8,

    RENEG_HANDSHAKE => 16,



    ALL_HANDSHAKES => 31

};



use constant {

    #DEFAULT ALSO INCLUDES SESSION_TICKET_SRV_EXTENSION

    DEFAULT_EXTENSIONS => 0x00000003,

    SESSION_TICKET_SRV_EXTENSION => 0x00000002,

    SERVER_NAME_CLI_EXTENSION => 0x00000004,

    SERVER_NAME_SRV_EXTENSION => 0x00000008,

    STATUS_REQUEST_CLI_EXTENSION => 0x00000010,

    STATUS_REQUEST_SRV_EXTENSION => 0x00000020,

    ALPN_CLI_EXTENSION => 0x00000040,

    ALPN_SRV_EXTENSION => 0x00000080,

    SCT_CLI_EXTENSION => 0x00000100,

    RENEGOTIATE_CLI_EXTENSION => 0x00000200

};



my @handmessages = (

    [TLSProxy::Message::MT_CLIENT_HELLO, ALL_HANDSHAKES],

    [TLSProxy::Message::MT_SERVER_HELLO, ALL_HANDSHAKES],

    [TLSProxy::Message::MT_CERTIFICATE, ALL_HANDSHAKES & ~RESUME_HANDSHAKE],

    [TLSProxy::Message::MT_CERTIFICATE_STATUS, OCSP_HANDSHAKE],

    #ServerKeyExchange handshakes not currently supported by TLSProxy

    [TLSProxy::Message::MT_CERTIFICATE_REQUEST, CLIENT_AUTH_HANDSHAKE],

    [TLSProxy::Message::MT_SERVER_HELLO_DONE, ALL_HANDSHAKES & ~RESUME_HANDSHAKE],

    [TLSProxy::Message::MT_CERTIFICATE, CLIENT_AUTH_HANDSHAKE],

    [TLSProxy::Message::MT_CLIENT_KEY_EXCHANGE, ALL_HANDSHAKES & ~RESUME_HANDSHAKE],

    [TLSProxy::Message::MT_CERTIFICATE_VERIFY, CLIENT_AUTH_HANDSHAKE],

    [TLSProxy::Message::MT_FINISHED, ALL_HANDSHAKES],

    [TLSProxy::Message::MT_NEW_SESSION_TICKET, ALL_HANDSHAKES & ~RESUME_HANDSHAKE],

    [TLSProxy::Message::MT_FINISHED, ALL_HANDSHAKES],

    [TLSProxy::Message::MT_CLIENT_HELLO, RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_SERVER_HELLO, RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_CERTIFICATE, RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_SERVER_HELLO_DONE, RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_CLIENT_KEY_EXCHANGE, RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_FINISHED, RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_NEW_SESSION_TICKET, RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_FINISHED, RENEG_HANDSHAKE],

    [0, 0]

);



my @extensions = (

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SERVER_NAME, SERVER_NAME_CLI_EXTENSION],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_STATUS_REQUEST, STATUS_REQUEST_CLI_EXTENSION],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SUPPORTED_GROUPS, DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_EC_POINT_FORMATS, DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SIG_ALGS, DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_ALPN, ALPN_CLI_EXTENSION],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SCT, SCT_CLI_EXTENSION],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_ENCRYPT_THEN_MAC, DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_EXTENDED_MASTER_SECRET, DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SESSION_TICKET, DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_RENEGOTIATE, RENEGOTIATE_CLI_EXTENSION],



    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_RENEGOTIATE, DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_ENCRYPT_THEN_MAC, DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_EXTENDED_MASTER_SECRET, DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_SESSION_TICKET, SESSION_TICKET_SRV_EXTENSION],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_SERVER_NAME, SERVER_NAME_SRV_EXTENSION],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_STATUS_REQUEST, STATUS_REQUEST_SRV_EXTENSION],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_ALPN, ALPN_SRV_EXTENSION],

    [0,0,0]

);



my $proxy = TLSProxy::Proxy->new(

    undef,
@@ -107,7 +46,97 @@ my $proxy = TLSProxy::Proxy->new( 
    (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})

);



sub checkmessages($$$);

sub checkhandshake($$$$$);



@handmessages = (

    [TLSProxy::Message::MT_CLIENT_HELLO,

        recipes::checkhandshake::ALL_HANDSHAKES],

    [TLSProxy::Message::MT_SERVER_HELLO,

        recipes::checkhandshake::ALL_HANDSHAKES],

    [TLSProxy::Message::MT_CERTIFICATE,

        recipes::checkhandshake::ALL_HANDSHAKES

        & ~recipes::checkhandshake::RESUME_HANDSHAKE],

    [TLSProxy::Message::MT_CERTIFICATE_STATUS,

        recipes::checkhandshake::OCSP_HANDSHAKE],

    #ServerKeyExchange handshakes not currently supported by TLSProxy

    [TLSProxy::Message::MT_CERTIFICATE_REQUEST,

        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],

    [TLSProxy::Message::MT_SERVER_HELLO_DONE,

        recipes::checkhandshake::ALL_HANDSHAKES

        & ~recipes::checkhandshake::RESUME_HANDSHAKE],

    [TLSProxy::Message::MT_CERTIFICATE,

        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],

    [TLSProxy::Message::MT_CLIENT_KEY_EXCHANGE,

        recipes::checkhandshake::ALL_HANDSHAKES

        & ~recipes::checkhandshake::RESUME_HANDSHAKE],

    [TLSProxy::Message::MT_CERTIFICATE_VERIFY,

        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],

    [TLSProxy::Message::MT_FINISHED,

        recipes::checkhandshake::ALL_HANDSHAKES],

    [TLSProxy::Message::MT_NEW_SESSION_TICKET,

        recipes::checkhandshake::ALL_HANDSHAKES

        & ~recipes::checkhandshake::RESUME_HANDSHAKE],

    [TLSProxy::Message::MT_FINISHED,

        recipes::checkhandshake::ALL_HANDSHAKES],

    [TLSProxy::Message::MT_CLIENT_HELLO,

        recipes::checkhandshake::RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_SERVER_HELLO,

        recipes::checkhandshake::RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_CERTIFICATE,

        recipes::checkhandshake::RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_SERVER_HELLO_DONE,

        recipes::checkhandshake::RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_CLIENT_KEY_EXCHANGE,

        recipes::checkhandshake::RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_FINISHED,

        recipes::checkhandshake::RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_NEW_SESSION_TICKET,

        recipes::checkhandshake::RENEG_HANDSHAKE],

    [TLSProxy::Message::MT_FINISHED,

        recipes::checkhandshake::RENEG_HANDSHAKE],

    [0, 0]

);



@extensions = (

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SERVER_NAME,

        recipes::checkhandshake::SERVER_NAME_CLI_EXTENSION],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_STATUS_REQUEST,

        recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SUPPORTED_GROUPS,

        recipes::checkhandshake::DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_EC_POINT_FORMATS,

        recipes::checkhandshake::DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SIG_ALGS,

        recipes::checkhandshake::DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_ALPN,

        recipes::checkhandshake::ALPN_CLI_EXTENSION],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SCT,

        recipes::checkhandshake::SCT_CLI_EXTENSION],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_ENCRYPT_THEN_MAC,

        recipes::checkhandshake::DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_EXTENDED_MASTER_SECRET,

        recipes::checkhandshake::DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SESSION_TICKET,

        recipes::checkhandshake::DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_RENEGOTIATE,

        recipes::checkhandshake::RENEGOTIATE_CLI_EXTENSION],



    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_RENEGOTIATE,

        recipes::checkhandshake::DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_ENCRYPT_THEN_MAC,

        recipes::checkhandshake::DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_EXTENDED_MASTER_SECRET,

        recipes::checkhandshake::DEFAULT_EXTENSIONS],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_SESSION_TICKET,

        recipes::checkhandshake::SESSION_TICKET_SRV_EXTENSION],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_SERVER_NAME,

        recipes::checkhandshake::SERVER_NAME_SRV_EXTENSION],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_STATUS_REQUEST,

        recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION],

    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_ALPN,

        recipes::checkhandshake::ALPN_SRV_EXTENSION],

    [0,0,0]

);



#Test 1: Check we get all the right messages for a default handshake

(undef, my $session) = tempfile();
@@ -115,14 +144,17 @@ $proxy->serverconnects(2); 
$proxy->clientflags("-no_tls1_3 -sess_out ".$session);

$proxy->start() or plan skip_all => "Unable to start up Proxy for tests";

plan tests => 5;

checkmessages(DEFAULT_HANDSHAKE, DEFAULT_EXTENSIONS, "Default handshake test");

checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,

               recipes::checkhandshake::DEFAULT_EXTENSIONS,

               "Default handshake test");



#Test 2: Resumption handshake

$proxy->clearClient();

$proxy->clientflags("-no_tls1_3 -sess_in ".$session);

$proxy->clientstart();

checkmessages(RESUME_HANDSHAKE,

              DEFAULT_EXTENSIONS & ~SESSION_TICKET_SRV_EXTENSION,

checkhandshake($proxy, recipes::checkhandshake::RESUME_HANDSHAKE,

               recipes::checkhandshake::DEFAULT_EXTENSIONS

               & ~recipes::checkhandshake::SESSION_TICKET_SRV_EXTENSION,

               "Resumption handshake test");

unlink $session;
@@ -132,9 +164,10 @@ $proxy->clientflags("-no_tls1_3 -status"); 
$proxy->serverflags("-status_file "

                    .srctop_file("test", "recipes", "ocsp-response.der"));

$proxy->start();

checkmessages(OCSP_HANDSHAKE,

              DEFAULT_EXTENSIONS | STATUS_REQUEST_CLI_EXTENSION

              | STATUS_REQUEST_SRV_EXTENSION,

checkhandshake($proxy, recipes::checkhandshake::OCSP_HANDSHAKE,

               recipes::checkhandshake::DEFAULT_EXTENSIONS

               | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION

               | recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION,

               "OCSP handshake test");



#Test 4: A client auth handshake
@@ -142,7 +175,8 @@ $proxy->clear(); 
$proxy->clientflags("-no_tls1_3 -cert ".srctop_file("apps", "server.pem"));

$proxy->serverflags("-Verify 5");

$proxy->start();

checkmessages(CLIENT_AUTH_HANDSHAKE, DEFAULT_EXTENSIONS,

checkhandshake($proxy, recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE,

               recipes::checkhandshake::DEFAULT_EXTENSIONS,

               "Client auth handshake test");



#Test 5: A handshake with a renegotiation
@@ -150,79 +184,8 @@ $proxy->clear(); 
$proxy->clientflags("-no_tls1_3");

$proxy->reneg(1);

$proxy->start();

checkmessages(RENEG_HANDSHAKE, DEFAULT_EXTENSIONS,

checkhandshake($proxy, recipes::checkhandshake::RENEG_HANDSHAKE,

               recipes::checkhandshake::DEFAULT_EXTENSIONS,

               "Rengotiation handshake test");



sub checkmessages($$$)

{

    my ($handtype, $exttype, $testname) = @_;



    subtest $testname => sub {

        my $loop = 0;

        my $numtests;

        my $extcount;

        my $clienthelloseen = 0;



        #First count the number of tests

        for ($numtests = 0; $handmessages[$loop][1] != 0; $loop++) {

            $numtests++ if (($handmessages[$loop][1] & $handtype) != 0);

        }



        #Add number of extensions we check plus 2 for the number of messages

        #that contain extensions

        $numtests += $#extensions + 2;

        #In a renegotiation we will have double the number of extension tests

        if (($handtype & RENEG_HANDSHAKE) != 0) {

            $numtests += $#extensions + 2;

        }

        plan tests => $numtests;



        my $nextmess = 0;

        my $message = undef;

        for ($loop = 0; $handmessages[$loop][1] != 0; $loop++) {

            next if (($handmessages[$loop][1] & $handtype) == 0);

            if (scalar @{$proxy->message_list} > $nextmess) {

                $message = ${$proxy->message_list}[$nextmess];

                $nextmess++;

            } else {

                $message = undef;

            }

            if (!defined $message) {

                fail("Message type check. Got nothing, expected "

                     .$handmessages[$loop][0]);

                next;

            } else {

                ok($message->mt == $handmessages[$loop][0],

                   "Message type check. Got ".$message->mt

                   .", expected ".$handmessages[$loop][0]);

            }



            next if ($message->mt() != TLSProxy::Message::MT_CLIENT_HELLO

                    && $message->mt() != TLSProxy::Message::MT_SERVER_HELLO

                    && $message->mt() !=

                       TLSProxy::Message::MT_ENCRYPTED_EXTENSIONS);



            if ($message->mt() == TLSProxy::Message::MT_CLIENT_HELLO) {

                #Add renegotiate extension we will expect if renegotiating

                $exttype |= RENEGOTIATE_CLI_EXTENSION if ($clienthelloseen);

                $clienthelloseen = 1;

            }

             #Now check that we saw the extensions we expected

             my $msgexts = $message->extension_data();

             for (my $extloop = 0, $extcount = 0; $extensions[$extloop][2] != 0;

                                $extloop++) {

                next if ($message->mt() != $extensions[$extloop][0]);

                ok (($extensions[$extloop][2] & $exttype) == 0

                      || defined ($msgexts->{$extensions[$extloop][1]}),

                    "Extension presence check (Message: ".$message->mt()

                    ." Extension: ".($extensions[$extloop][2] & $exttype).", "

                    .$extloop.")");

                $extcount++ if (($extensions[$extloop][2] & $exttype) != 0);

             }

            ok($extcount == keys %$msgexts, "Extensions count mismatch ("

                                            .$extcount.", ".(keys %$msgexts)

                                            .")");

        }

    }

}

test/recipes/70-test_tls13messages.t

+104 −128

File changed.

Preview size limit exceeded, changes collapsed.

test/recipes/checkhandshake.pm

0 → 100644
+123 −0
Original line number Diff line number Diff line 
#! /usr/bin/env perl

# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.

#

# Licensed under the OpenSSL license (the "License").  You may not use

# this file except in compliance with the License.  You can obtain a copy

# in the file LICENSE in the source distribution or at

# https://www.openssl.org/source/license.html



package recipes::checkhandshake;



use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file srctop_dir bldtop_dir/;

use OpenSSL::Test::Utils;

use TLSProxy::Proxy;



use Exporter;

our @ISA = 'Exporter';

our @EXPORT = qw(@handmessages @extensions checkhandshake);



use constant {

    DEFAULT_HANDSHAKE => 1,

    OCSP_HANDSHAKE => 2,

    RESUME_HANDSHAKE => 4,

    CLIENT_AUTH_HANDSHAKE => 8,

    RENEG_HANDSHAKE => 16,



    ALL_HANDSHAKES => 31

};



use constant {

    #DEFAULT ALSO INCLUDES SESSION_TICKET_SRV_EXTENSION

    DEFAULT_EXTENSIONS => 0x00000003,

    SESSION_TICKET_SRV_EXTENSION => 0x00000002,

    SERVER_NAME_CLI_EXTENSION => 0x00000004,

    SERVER_NAME_SRV_EXTENSION => 0x00000008,

    STATUS_REQUEST_CLI_EXTENSION => 0x00000010,

    STATUS_REQUEST_SRV_EXTENSION => 0x00000020,

    ALPN_CLI_EXTENSION => 0x00000040,

    ALPN_SRV_EXTENSION => 0x00000080,

    SCT_CLI_EXTENSION => 0x00000100,

    RENEGOTIATE_CLI_EXTENSION => 0x00000200

};



our @handmessages = ();

our @extensions = ();



sub checkhandshake($$$$)

{

    my ($proxy, $handtype, $exttype, $testname) = @_;



    subtest $testname => sub {

        my $loop = 0;

        my $numtests;

        my $extcount;

        my $clienthelloseen = 0;



        #First count the number of tests

        for ($numtests = 0; $handmessages[$loop][1] != 0; $loop++) {

            $numtests++ if (($handmessages[$loop][1] & $handtype) != 0);

        }



        #Add number of extensions we check plus 2 for the number of messages

        #that contain extensions

        $numtests += $#extensions + 2;

        #In a renegotiation we will have double the number of extension tests

        if (($handtype & RENEG_HANDSHAKE) != 0) {

            $numtests += $#extensions + 2;

        }

        #In TLS1.3 there are 3 messages with extensions (and no renegotiations)

        $numtests += 1 if ($proxy->is_tls13());



        plan tests => $numtests;



        my $nextmess = 0;

        my $message = undef;

        for ($loop = 0; $handmessages[$loop][1] != 0; $loop++) {

            next if (($handmessages[$loop][1] & $handtype) == 0);

            if (scalar @{$proxy->message_list} > $nextmess) {

                $message = ${$proxy->message_list}[$nextmess];

                $nextmess++;

            } else {

                $message = undef;

            }

            if (!defined $message) {

                fail("Message type check. Got nothing, expected "

                     .$handmessages[$loop][0]);

                next;

            } else {

                ok($message->mt == $handmessages[$loop][0],

                   "Message type check. Got ".$message->mt

                   .", expected ".$handmessages[$loop][0]);

            }



            next if ($message->mt() != TLSProxy::Message::MT_CLIENT_HELLO

                    && $message->mt() != TLSProxy::Message::MT_SERVER_HELLO

                    && $message->mt() !=

                       TLSProxy::Message::MT_ENCRYPTED_EXTENSIONS);



            if ($message->mt() == TLSProxy::Message::MT_CLIENT_HELLO) {

                #Add renegotiate extension we will expect if renegotiating

                $exttype |= RENEGOTIATE_CLI_EXTENSION if ($clienthelloseen);

                $clienthelloseen = 1;

            }

            #Now check that we saw the extensions we expected

            my $msgexts = $message->extension_data();



            for (my $extloop = 0, $extcount = 0; $extensions[$extloop][2] != 0;

                                $extloop++) {

                next if ($message->mt() != $extensions[$extloop][0]);

                ok (($extensions[$extloop][2] & $exttype) == 0

                      || defined ($msgexts->{$extensions[$extloop][1]}),

                    "Extension presence check (Message: ".$message->mt()

                    ." Extension: ".($extensions[$extloop][2] & $exttype).", "

                    .$extloop.")");

                $extcount++ if (($extensions[$extloop][2] & $exttype) != 0);

             }

            ok($extcount == keys %$msgexts, "Extensions count mismatch ("

                                            .$extcount.", ".(keys %$msgexts)

                                            .")");

        }

    }

}



1;