Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
340166a9
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
1 年多 前同步成功
通知
10
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
340166a9
编写于
9月 19, 2015
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change test recipes to use disabled()
Reviewed-by:
N
Richard Levitte
<
levitte@openssl.org
>
上级
0d297b42
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
26 addition
and
20 deletion
+26
-20
test/recipes/15-test_dsa.t
test/recipes/15-test_dsa.t
+2
-1
test/recipes/15-test_ec.t
test/recipes/15-test_ec.t
+2
-1
test/recipes/15-test_rsa.t
test/recipes/15-test_rsa.t
+2
-1
test/recipes/25-test_gen.t
test/recipes/25-test_gen.t
+2
-1
test/recipes/80-test_cms.t
test/recipes/80-test_cms.t
+4
-6
test/recipes/80-test_ssl.t
test/recipes/80-test_ssl.t
+14
-10
未找到文件。
test/recipes/15-test_dsa.t
浏览文件 @
340166a9
...
...
@@ -5,6 +5,7 @@ use warnings;
use
File::
Spec
;
use
OpenSSL::
Test
qw/:DEFAULT top_file/
;
use
OpenSSL::Test::
Utils
;
setup
("
test_dsa
");
...
...
@@ -17,7 +18,7 @@ ok(run(test(["dsatest", "-app2_1"])), "running dsatest -app2_1");
SKIP:
{
skip
"
Skipping dsa conversion test
",
3
if
run
(
app
(["
openssl
","
no-dsa
"],
stdout
=>
undef
)
);
if
disabled
("
dsa
"
);
subtest
'
dsa conversions -- private key
'
=>
sub
{
tconversion
("
dsa
",
top_file
("
test
","
testdsa.pem
"));
...
...
test/recipes/15-test_ec.t
浏览文件 @
340166a9
...
...
@@ -5,6 +5,7 @@ use warnings;
use
File::
Spec
;
use
OpenSSL::
Test
qw/:DEFAULT top_file/
;
use
OpenSSL::Test::
Utils
;
setup
("
test_ec
");
...
...
@@ -16,7 +17,7 @@ ok(run(test(["ectest"])), "running ectest");
SKIP:
{
skip
"
Skipping ec conversion test
",
3
if
run
(
app
(["
openssl
","
no-ec
"],
stdout
=>
undef
)
);
if
disabled
("
ec
"
);
subtest
'
ec conversions -- private key
'
=>
sub
{
tconversion
("
ec
",
top_file
("
test
","
testec-p256.pem
"));
...
...
test/recipes/15-test_rsa.t
浏览文件 @
340166a9
...
...
@@ -5,6 +5,7 @@ use warnings;
use
File::
Spec
;
use
OpenSSL::
Test
qw/:DEFAULT top_file/
;
use
OpenSSL::Test::
Utils
;
setup
("
test_rsa
");
...
...
@@ -16,7 +17,7 @@ ok(run(test(["rsa_test"])), "running rsatest");
SKIP:
{
skip
"
Skipping rsa conversion test
",
3
if
run
(
app
(["
openssl
","
no-rsa
"],
stdout
=>
undef
)
);
if
disabled
("
rsa
"
);
subtest
'
rsa conversions -- private key
'
=>
sub
{
tconversion
("
rsa
",
top_file
("
test
","
testrsa.pem
"));
...
...
test/recipes/25-test_gen.t
浏览文件 @
340166a9
...
...
@@ -5,6 +5,7 @@ use warnings;
use
File::
Spec
;
use
OpenSSL::
Test
qw/:DEFAULT top_file/
;
use
OpenSSL::Test::
Utils
;
setup
("
test_gen
");
...
...
@@ -21,7 +22,7 @@ close RND;
subtest
"
generating certificate requests
"
=>
sub
{
my
@req_new
;
if
(
run
(
app
(["
openssl
",
"
no-rsa
"],
stdout
=>
undef
)
))
{
if
(
disabled
("
rsa
"
))
{
@req_new
=
("
-newkey
",
"
dsa:
"
.
top_file
("
apps
",
"
dsa512.pem
"));
}
else
{
@req_new
=
("
-new
");
...
...
test/recipes/80-test_cms.t
浏览文件 @
340166a9
...
...
@@ -7,14 +7,13 @@ use POSIX;
use
File::Spec::
Functions
qw/catfile/
;
use
File::
Compare
qw/compare_text/
;
use
OpenSSL::
Test
qw/:DEFAULT top_dir top_file/
;
use
OpenSSL::Test::
Utils
;
setup
("
test_cms
");
my
$smdir
=
top_dir
("
test
",
"
smime-certs
");
my
$smcont
=
top_file
("
test
",
"
smcont.txt
");
my
$no_ec
=
run
(
app
(["
openssl
",
"
no-ec
"],
stdout
=>
undef
));
my
$no_ec2m
=
run
(
app
(["
openssl
",
"
no-ec2m
"],
stdout
=>
undef
));
my
$no_ecdh
=
run
(
app
(["
openssl
",
"
no-ecdh
"],
stdout
=>
undef
));
my
(
$no_ec
,
$no_ec2m
,
$no_zlib
)
=
disabled
qw/ec ec2m zlib/
;
plan
tests
=>
4
;
...
...
@@ -442,8 +441,7 @@ subtest "CMS <=> CMS consistency tests, modified key parameters\n" => sub {
SKIP:
{
skip
("
Zlib not supported: compression tests skipped
",
scalar
@smime_cms_comp_tests
)
unless
grep
/ZLIB/
,
run
(
app
(["
openssl
",
"
version
",
"
-f
"]),
capture
=>
1
);
if
$no_zlib
;
foreach
(
@smime_cms_comp_tests
)
{
SKIP:
{
...
...
@@ -469,7 +467,7 @@ sub check_availability {
return
"
$tnam
: skipped, EC disabled
\n
"
if
(
$no_ec
&&
$tnam
=~
/ECDH/
);
return
"
$tnam
: skipped, ECDH disabled
\n
"
if
(
$no_ec
dh
&&
$tnam
=~
/ECDH/
);
if
(
$no_ec
&&
$tnam
=~
/ECDH/
);
return
"
$tnam
: skipped, EC2M disabled
\n
"
if
(
$no_ec2m
&&
$tnam
=~
/K-283/
);
return
"";
...
...
test/recipes/80-test_ssl.t
浏览文件 @
340166a9
...
...
@@ -7,9 +7,13 @@ use POSIX;
use
File::
Spec
;
use
File::
Copy
;
use
OpenSSL::
Test
qw/:DEFAULT with top_file cmdstr/
;
use
OpenSSL::Test::
Utils
;
setup
("
test_ssl
");
my
(
$no_rsa
,
$no_dsa
,
$no_dh
,
$no_ec
,
$no_srp
,
$no_psk
)
=
disabled
qw/rsa dsa dh ec srp psk/
;
my
$digest
=
"
-sha1
";
my
@reqcmd
=
("
openssl
",
"
req
");
my
@x509cmd
=
("
openssl
",
"
x509
",
$digest
);
...
...
@@ -94,7 +98,7 @@ sub testss {
my
@req_dsa
=
("
-newkey
",
"
dsa:
"
.
File::
Spec
->
catfile
("
..
",
"
apps
",
"
dsa1024.pem
"));;
my
@req_new
;
if
(
run
(
app
(["
openssl
",
"
no-rsa
"],
stdout
=>
undef
))
)
{
if
(
$no_rsa
)
{
@req_new
=
@req_dsa
;
}
else
{
@req_new
=
("
-new
");
...
...
@@ -161,7 +165,7 @@ sub testss {
skip
'
failure
',
7
unless
subtest
'
DSA certificate creation
'
=>
sub
{
plan
skip_all
=>
"
skipping DSA certificate creation
"
if
run
(
app
(["
openssl
",
"
no-dsa
"],
stdout
=>
undef
))
;
if
$no_dsa
;
plan
tests
=>
4
;
...
...
@@ -200,7 +204,7 @@ sub testss {
skip
'
failure
',
6
unless
subtest
'
ECDSA/ECDH certificate creation
'
=>
sub
{
plan
skip_all
=>
"
skipping ECDSA/ECDH certificate creation
"
if
run
(
app
(["
openssl
",
"
no-ec
"],
stdout
=>
undef
))
;
if
$no_ec
;
plan
tests
=>
5
;
...
...
@@ -385,18 +389,18 @@ sub testssl {
my
@exkeys
=
();
my
$ciphers
=
"
-EXP:-PSK:-SRP:-kDH:-kECDHe
";
if
(
run
(
app
(["
openssl
",
"
no-dhparam
"],
stdout
=>
undef
))
)
{
if
(
$no_dh
)
{
note
"
skipping DHE tests
\n
";
$ciphers
.=
"
:-kDHE
";
}
if
(
run
(
app
(["
openssl
",
"
no-dsa
"],
stdout
=>
undef
))
)
{
if
(
$no_dsa
)
{
note
"
skipping DSA tests
\n
";
$ciphers
.=
"
:-aDSA
";
}
else
{
push
@exkeys
,
"
-s_cert
",
"
certD.ss
",
"
-s_key
",
"
keyD.ss
";
}
if
(
run
(
app
(["
openssl
",
"
no-ec
"],
stdout
=>
undef
))
)
{
if
(
$no_ec
)
{
note
"
skipping EC tests
\n
";
$ciphers
.=
"
:!aECDSA:!kECDH
";
}
else
{
...
...
@@ -442,7 +446,7 @@ sub testssl {
{
SKIP:
{
skip
"
skipping anonymous DH tests
",
1
if
(
run
(
app
(["
openssl
",
"
no-dhparam
"],
stdout
=>
undef
))
);
if
(
$no_dh
);
ok
(
run
(
test
([
@ssltest
,
"
-v
",
"
-bio_pair
",
"
-tls1
",
"
-cipher
",
"
ADH
",
"
-dhe1024dsa
",
"
-num
",
"
10
",
"
-f
",
"
-time
",
@extra
])),
'
test tlsv1 with 1024bit anonymous DH, multiple handshakes
');
...
...
@@ -452,13 +456,13 @@ sub testssl {
{
SKIP:
{
skip
"
skipping RSA tests
",
2
if
(
run
(
app
(["
openssl
",
"
no-rsa
"],
stdout
=>
undef
)))
;
if
$no_rsa
;
ok
(
run
(
test
(["
ssltest
",
"
-v
",
"
-bio_pair
",
"
-tls1
",
"
-s_cert
",
top_file
("
apps
","
server2.pem
"),
"
-no_dhe
",
"
-no_ecdhe
",
"
-num
",
"
10
",
"
-f
",
"
-time
",
@extra
])),
'
test tlsv1 with 1024bit RSA, no (EC)DHE, multiple handshakes
');
skip
"
skipping RSA+DHE tests
",
1
if
(
run
(
app
(["
openssl
",
"
no-dhparam
"],
stdout
=>
undef
)))
;
if
$no_dh
;
ok
(
run
(
test
(["
ssltest
",
"
-v
",
"
-bio_pair
",
"
-tls1
",
"
-s_cert
",
top_file
("
apps
","
server2.pem
"),
"
-dhe1024dsa
",
"
-num
",
"
10
",
"
-f
",
"
-time
",
@extra
])),
'
test tlsv1 with 1024bit RSA, 1024bit DHE, multiple handshakes
');
...
...
@@ -524,7 +528,7 @@ sub testssl {
{
SKIP:
{
skip
"
skipping SRP tests
",
4
if
run
(
app
(["
openssl
",
"
no-srp
"],
stdout
=>
undef
))
;
if
$no_srp
;
ok
(
run
(
test
([
@ssltest
,
"
-tls1
",
"
-cipher
",
"
SRP
",
"
-srpuser
",
"
test
",
"
-srppass
",
"
abc123
"])),
'
test tls1 with SRP
');
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录