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

Fix more style issues following extensions refactor feedback 



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 cbb09544

ssl/ssl_locl.h

+1 −1
Original line number Diff line number Diff line
@@ -1642,7 +1642,7 @@ typedef struct raw_extension_st { 
    int present;

    /* Set to 1 if we have already parsed the extension or 0 otherwise */

    int parsed;

    /* The type of this extension */

    /* The type of this extension, i.e. a TLSEXT_TYPE_* value */

    unsigned int type;

} RAW_EXTENSION;

ssl/statem/extensions.c

+2 −0
Original line number Diff line number Diff line
@@ -349,6 +349,8 @@ int tls_collect_extensions(SSL *s, PACKET *packet, unsigned int context, 
    RAW_EXTENSION *raw_extensions = NULL;

    const EXTENSION_DEFINITION *thisexd;



    *res = NULL;



    /*

     * Initialise server side custom extensions. Client side is done during

     * construction of extensions for the ClientHello.

test/recipes/70-test_key_share.t

+4 −4
Original line number Diff line number Diff line
@@ -194,9 +194,9 @@ $proxy->clear(); 
$proxy->filter(undef);

$proxy->clientflags("-no_tls1_3");

$proxy->start();

my $clienthello = ${$proxy->message_list}[0];

my $clienthello = $proxy->message_list->[0];

ok(TLSProxy::Message->success()

   && !defined ${$clienthello->extension_data}{TLSProxy::Message::EXT_KEY_SHARE},

   && !defined $clienthello->extension_data->{TLSProxy::Message::EXT_KEY_SHARE},

   "No key_share for TLS<=1.2 client");

$proxy->filter(\&modify_key_shares_filter);
@@ -304,7 +304,7 @@ sub modify_key_shares_filter 
                     && $direction == SERVER_TO_CLIENT) {

            my $ext;

            my $key_share =

                ${$message->extension_data}{TLSProxy::Message::EXT_KEY_SHARE};

                $message->extension_data->{TLSProxy::Message::EXT_KEY_SHARE};

            $selectedgroupid = unpack("n", $key_share);



            if ($testtype == LOOK_ONLY) {