wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix more style issues following extensions refactor feedback

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

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-12-07 23:19:45 +00:00
parent cbb0954471
commit ecc2f938cf
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ssl/ssl_locl.h
View file

@ -1642,7 +1642,7 @@ typedef struct raw_extension_st {
int present; int present;
/* Set to 1 if we have already parsed the extension or 0 otherwise */ /* Set to 1 if we have already parsed the extension or 0 otherwise */
int parsed; int parsed;
/* The type of this extension */ /* The type of this extension, i.e. a TLSEXT_TYPE_* value */
unsigned int type; unsigned int type;
} RAW_EXTENSION; } RAW_EXTENSION;

2
ssl/statem/extensions.c
View file

@ -349,6 +349,8 @@ int tls_collect_extensions(SSL *s, PACKET *packet, unsigned int context,
RAW_EXTENSION *raw_extensions = NULL; RAW_EXTENSION *raw_extensions = NULL;
const EXTENSION_DEFINITION *thisexd; const EXTENSION_DEFINITION *thisexd;
*res = NULL;
/* /*
* Initialise server side custom extensions. Client side is done during * Initialise server side custom extensions. Client side is done during
* construction of extensions for the ClientHello. * construction of extensions for the ClientHello.

8
test/recipes/70-test_key_share.t
View file

@ -194,9 +194,9 @@ $proxy->clear();
$proxy->filter(undef); $proxy->filter(undef);
$proxy->clientflags("-no_tls1_3"); $proxy->clientflags("-no_tls1_3");
$proxy->start(); $proxy->start();
my $clienthello = ${$proxy->message_list}[0]; my $clienthello = $proxy->message_list->[0];
ok(TLSProxy::Message->success() 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"); "No key_share for TLS<=1.2 client");
$proxy->filter(\&modify_key_shares_filter); $proxy->filter(\&modify_key_shares_filter);
@ -304,7 +304,7 @@ sub modify_key_shares_filter
&& $direction == SERVER_TO_CLIENT) { && $direction == SERVER_TO_CLIENT) {
my $ext; my $ext;
my $key_share = my $key_share =
${$message->extension_data}{TLSProxy::Message::EXT_KEY_SHARE}; $message->extension_data->{TLSProxy::Message::EXT_KEY_SHARE};
$selectedgroupid = unpack("n", $key_share); $selectedgroupid = unpack("n", $key_share);
if ($testtype == LOOK_ONLY) { if ($testtype == LOOK_ONLY) {
@ -336,7 +336,7 @@ sub modify_key_shares_filter
"EDF83495E80380089F831B94D14B1421", #key_exchange data "EDF83495E80380089F831B94D14B1421", #key_exchange data
0x00; #Trailing garbage 0x00; #Trailing garbage
} }
$message->set_extension( TLSProxy::Message::EXT_KEY_SHARE, $ext); $message->set_extension(TLSProxy::Message::EXT_KEY_SHARE, $ext);
$message->repack(); $message->repack();
} }