Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
aedf33ae
O
openssl
项目概览
btwise
/
openssl
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aedf33ae
编写于
10月 19, 2016
作者:
M
Matt Caswell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove some flags that are unused in the shim
Reviewed-by:
N
Richard Levitte
<
levitte@openssl.org
>
上级
06e452fb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
2 addition
and
27 deletion
+2
-27
test/ossl_shim/ossl_shim.cc
test/ossl_shim/ossl_shim.cc
+2
-3
test/ossl_shim/test_config.cc
test/ossl_shim/test_config.cc
+0
-13
test/ossl_shim/test_config.h
test/ossl_shim/test_config.h
+0
-11
未找到文件。
test/ossl_shim/ossl_shim.cc
浏览文件 @
aedf33ae
...
...
@@ -340,7 +340,7 @@ static int CertCallback(SSL *ssl, void *arg) {
}
// The certificate will be installed via other means.
if
(
!
config
->
async
||
config
->
use_early_callback
||
if
(
!
config
->
async
||
config
->
use_old_client_cert_callback
)
{
return
1
;
}
...
...
@@ -890,8 +890,7 @@ static bool DoExchange(bssl::UniquePtr<SSL_SESSION> *out_session,
return
false
;
}
// Install the certificate synchronously if nothing else will handle it.
if
(
!
config
->
use_early_callback
&&
!
config
->
use_old_client_cert_callback
&&
if
(
!
config
->
use_old_client_cert_callback
&&
!
config
->
async
&&
!
InstallCertificate
(
ssl
.
get
()))
{
return
false
;
...
...
test/ossl_shim/test_config.cc
浏览文件 @
aedf33ae
...
...
@@ -52,7 +52,6 @@ const Flag<bool> kBoolFlags[] = {
{
"-async"
,
&
TestConfig
::
async
},
{
"-write-different-record-sizes"
,
&
TestConfig
::
write_different_record_sizes
},
{
"-cbc-record-splitting"
,
&
TestConfig
::
cbc_record_splitting
},
{
"-partial-write"
,
&
TestConfig
::
partial_write
},
{
"-no-tls13"
,
&
TestConfig
::
no_tls13
},
{
"-no-tls12"
,
&
TestConfig
::
no_tls12
},
...
...
@@ -65,10 +64,6 @@ const Flag<bool> kBoolFlags[] = {
{
"-expect-extended-master-secret"
,
&
TestConfig
::
expect_extended_master_secret
},
{
"-implicit-handshake"
,
&
TestConfig
::
implicit_handshake
},
{
"-use-early-callback"
,
&
TestConfig
::
use_early_callback
},
{
"-fail-early-callback"
,
&
TestConfig
::
fail_early_callback
},
{
"-fail-ddos-callback"
,
&
TestConfig
::
fail_ddos_callback
},
{
"-fail-second-ddos-callback"
,
&
TestConfig
::
fail_second_ddos_callback
},
{
"-handshake-never-done"
,
&
TestConfig
::
handshake_never_done
},
{
"-use-export-context"
,
&
TestConfig
::
use_export_context
},
{
"-expect-ticket-renewal"
,
&
TestConfig
::
expect_ticket_renewal
},
...
...
@@ -94,7 +89,6 @@ const Flag<bool> kBoolFlags[] = {
&
TestConfig
::
use_old_client_cert_callback
},
{
"-use-null-client-ca-list"
,
&
TestConfig
::
use_null_client_ca_list
},
{
"-peek-then-read"
,
&
TestConfig
::
peek_then_read
},
{
"-enable-grease"
,
&
TestConfig
::
enable_grease
},
};
const
Flag
<
std
::
string
>
kStringFlags
[]
=
{
...
...
@@ -119,9 +113,6 @@ const Flag<std::string> kStringFlags[] = {
const
Flag
<
std
::
string
>
kBase64Flags
[]
=
{
{
"-expect-certificate-types"
,
&
TestConfig
::
expected_certificate_types
},
{
"-expect-ocsp-response"
,
&
TestConfig
::
expected_ocsp_response
},
{
"-expect-signed-cert-timestamps"
,
&
TestConfig
::
expected_signed_cert_timestamps
},
};
const
Flag
<
int
>
kIntFlags
[]
=
{
...
...
@@ -132,10 +123,6 @@ const Flag<int> kIntFlags[] = {
{
"-mtu"
,
&
TestConfig
::
mtu
},
{
"-export-keying-material"
,
&
TestConfig
::
export_keying_material
},
{
"-expect-total-renegotiations"
,
&
TestConfig
::
expect_total_renegotiations
},
{
"-expect-peer-signature-algorithm"
,
&
TestConfig
::
expect_peer_signature_algorithm
},
{
"-expect-curve-id"
,
&
TestConfig
::
expect_curve_id
},
{
"-expect-dhe-group-size"
,
&
TestConfig
::
expect_dhe_group_size
},
{
"-max-cert-list"
,
&
TestConfig
::
max_cert_list
},
};
...
...
test/ossl_shim/test_config.h
浏览文件 @
aedf33ae
...
...
@@ -35,7 +35,6 @@ struct TestConfig {
std
::
string
select_next_proto
;
bool
async
=
false
;
bool
write_different_record_sizes
=
false
;
bool
cbc_record_splitting
=
false
;
bool
partial_write
=
false
;
bool
no_tls13
=
false
;
bool
no_tls12
=
false
;
...
...
@@ -54,16 +53,10 @@ struct TestConfig {
std
::
string
psk
;
std
::
string
psk_identity
;
std
::
string
srtp_profiles
;
std
::
string
expected_ocsp_response
;
std
::
string
expected_signed_cert_timestamps
;
int
min_version
=
0
;
int
max_version
=
0
;
int
mtu
=
0
;
bool
implicit_handshake
=
false
;
bool
use_early_callback
=
false
;
bool
fail_early_callback
=
false
;
bool
fail_ddos_callback
=
false
;
bool
fail_second_ddos_callback
=
false
;
std
::
string
cipher
;
bool
handshake_never_done
=
false
;
int
export_keying_material
=
0
;
...
...
@@ -85,16 +78,12 @@ struct TestConfig {
bool
expect_verify_result
=
false
;
int
expect_total_renegotiations
=
0
;
bool
renegotiate_freely
=
false
;
int
expect_peer_signature_algorithm
=
0
;
bool
p384_only
=
false
;
bool
enable_all_curves
=
false
;
bool
use_sparse_dh_prime
=
false
;
int
expect_curve_id
=
0
;
int
expect_dhe_group_size
=
0
;
bool
use_old_client_cert_callback
=
false
;
bool
use_null_client_ca_list
=
false
;
bool
peek_then_read
=
false
;
bool
enable_grease
=
false
;
int
max_cert_list
=
0
;
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录