提交 ecc2f938 编写于 作者: M Matt Caswell

Fix more style issues following extensions refactor feedback

Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich
Salz
Reviewed-by: NRich Salz <rsalz@openssl.org>
Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 cbb09544
......@@ -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;
......
......@@ -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.
......
......@@ -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) {
......@@ -336,7 +336,7 @@ sub modify_key_shares_filter
"EDF83495E80380089F831B94D14B1421", #key_exchange data
0x00; #Trailing garbage
}
$message->set_extension( TLSProxy::Message::EXT_KEY_SHARE, $ext);
$message->set_extension(TLSProxy::Message::EXT_KEY_SHARE, $ext);
$message->repack();
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册