Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
大约 1 年 前同步成功

通知 9
Star 18
Fork 1
T
Third Party Openssl

体验新版 GitCode，发现更多精彩内容 >>

提交 1c73c3bc 编写于 作者: R Richard Levitte
浏览文件
操作

Change the 80-test_tsa recipe as per changes in testtsa 

Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 ca5d7dff
隐藏空白更改
内联 并排
Showing with 136 addition and 164 deletion
test/recipes/80-test_tsa.t
浏览文件 @ 1c73c3bc
...@@ -14,61 +14,24 @@ setup("test_tsa"); ...@@ -14,61 +14,24 @@ setup("test_tsa");
# here, however, to be available in all subroutines. # here, however, to be available in all subroutines.
my $testtsa; my $testtsa;
my $CAtsa; my $CAtsa;
my @RUN = ("openssl", "ts");
sub create_ca {
$ENV{TSDNSECT} = "ts_ca_dn";
return
ok(run(app(["openssl", "req", "-new", "-x509", "-nodes",
"-out", "tsaca.pem", "-keyout", "tsacakey.pem"])),
'creating a new CA for the TSA tests');
}
sub create_tsa_cert { sub create_tsa_cert {
my $INDEX = shift; my $INDEX = shift;
my $EXT = shift; my $EXT = shift;
my $r = 1; my $r = 1;
$ENV{TSDNSECT} = "ts_ca_dn"; $ENV{TSDNSECT} = "ts_cert_dn";
$r *= ok(run(app(["openssl", "req", "-new", ok(run(app(["openssl", "req", "-new",
"-out", "tsa_req${INDEX}.pem", "-out", "tsa_req${INDEX}.pem",
"-keyout", "tsa_key${INDEX}.pem"]))); "-keyout", "tsa_key${INDEX}.pem"])));
note "using extension $EXT"; note "using extension $EXT";
$r *= ok(run(app(["openssl", "x509", "-req", ok(run(app(["openssl", "x509", "-req",
"-in", "tsa_req${INDEX}.pem", "-in", "tsa_req${INDEX}.pem",
"-out", "tsa_cert${INDEX}.pem", "-out", "tsa_cert${INDEX}.pem",
"-CA", "tsaca.pem", "-CAkey", "tsacakey.pem", "-CA", "tsaca.pem", "-CAkey", "tsacakey.pem",
"-CAcreateserial", "-CAcreateserial",
"-extfile", $ENV{OPENSSL_CONF}, "-extensions", $EXT]))); "-extfile", $ENV{OPENSSL_CONF}, "-extensions", $EXT])));
return $r;
}
sub print_request {
my $input = shift;
return ok(run(app(["openssl", "ts", "-query", "-in", $input, "-text"])));
}
sub create_time_stamp_request1 {
return
ok(run(app(["openssl", "ts", "-query", "-data", $testtsa, "-policy", "tsa_policy1", "-cert", "-out", "req1.tsq"])));
}
sub create_time_stamp_request2 {
return
ok(run(app(["openssl", "ts", "-query", "-data", $testtsa, "-policy", "tsa_policy2", "-no_nonce", "-out", "req2.tsq"])));
}
sub create_time_stamp_request3 {
return
ok(run(app(["openssl", "ts", "-query", "-data", $CAtsa, "-no_nonce", "-out", "req3.tsq"])))
}
sub print_response {
my $inputfile = shift;
return
ok(run(app(["openssl", "ts", "-reply", "-in", "$inputfile", "-text"])));
} }
sub create_time_stamp_response { sub create_time_stamp_response {
...@@ -76,22 +39,8 @@ sub create_time_stamp_response { ...@@ -76,22 +39,8 @@ sub create_time_stamp_response {
my $outputfile = shift; my $outputfile = shift;
my $datafile = shift; my $datafile = shift;
return ok(run(app([@RUN, "-reply", "-section", "$datafile",
ok(run(app(["openssl", "ts", "-reply", "-section", "$datafile", "-queryfile", "$queryfile", "-out", "$outputfile"]))); "-queryfile", "$queryfile", "-out", "$outputfile"])));
}
sub time_stamp_response_token_test {
my $queryfile = shift;
my $inputfile = shift;
my $RESPONSE2="$inputfile.copy.tsr";
my $TOKEN_DER="$inputfile.token.der";
ok(run(app(["openssl", "ts", "-reply", "-in", "$inputfile", "-out", "$TOKEN_DER", "-token_out"])));
ok(run(app(["openssl", "ts", "-reply", "-in", "$TOKEN_DER", "-token_in", "-out", "$RESPONSE2"])));
is(compare($RESPONSE2, $inputfile), 0);
ok(run(app(["openssl", "ts", "-reply", "-in", "$inputfile", "-text", "-token_out"])));
ok(run(app(["openssl", "ts", "-reply", "-in", "$TOKEN_DER", "-token_in", "-text", "-token_out"])));
ok(run(app(["openssl", "ts", "-reply", "-queryfile", "$queryfile", "-text", "-token_out"])));
} }
sub verify_time_stamp_response { sub verify_time_stamp_response {
...@@ -99,32 +48,30 @@ sub verify_time_stamp_response { ...@@ -99,32 +48,30 @@ sub verify_time_stamp_response {
my $inputfile = shift; my $inputfile = shift;
my $datafile = shift; my $datafile = shift;
ok(run(app(["openssl", "ts", "-verify", "-queryfile", "$queryfile", "-in", "$inputfile", "-CAfile", "tsaca.pem", "-untrusted", "tsa_cert1.pem"]))); ok(run(app([@RUN, "-verify", "-queryfile", "$queryfile",
ok(run(app(["openssl", "ts", "-verify", "-data", "$datafile", "-in", "$inputfile", "-CAfile", "tsaca.pem", "-untrusted", "tsa_cert1.pem"]))); "-in", "$inputfile", "-CAfile", "tsaca.pem",
} "-untrusted", "tsa_cert1.pem"])));
ok(run(app([@RUN, "-verify", "-data", "$datafile",
sub verify_time_stamp_token { "-in", "$inputfile", "-CAfile", "tsaca.pem",
my $queryfile = shift; "-untrusted", "tsa_cert1.pem"])));
my $inputfile = shift;
my $datafile = shift;
# create the token from the response first
ok(run(app(["openssl", "ts", "-reply", "-in", "$inputfile", "-out", "$inputfile.token", "-token_out"])));
ok(run(app(["openssl", "ts", "-verify", "-queryfile", "$queryfile", "-in", "$inputfile.token", "-token_in", "-CAfile", "tsaca.pem", "-untrusted", "tsa_cert1.pem"])));
ok(run(app(["openssl", "ts", "-verify", "-data", "$datafile", "-in", "$inputfile.token", "-token_in", "-CAfile", "tsaca.pem", "-untrusted", "tsa_cert1.pem"])));
} }
sub verify_time_stamp_response_fail { sub verify_time_stamp_response_fail {
my $queryfile = shift; my $queryfile = shift;
my $inputfile = shift; my $inputfile = shift;
ok(!run(app(["openssl", "ts", "-verify", "-queryfile", "$queryfile", "-in", "$inputfile", "-CAfile", "tsaca.pem", "-untrusted", "tsa_cert1.pem"]))); ok(!run(app([@RUN, "-verify", "-queryfile", "$queryfile",
"-in", "$inputfile", "-CAfile", "tsaca.pem",
"-untrusted", "tsa_cert1.pem"])));
} }
# main functions # main functions
indir "tsa" => sub { plan tests => 20;
note "setting up TSA test directory";
indir "tsa" => sub
{
$ENV{OPENSSL_CONF} = top_file("test", "CAtsa.cnf"); $ENV{OPENSSL_CONF} = top_file("test", "CAtsa.cnf");
# Because that's what ../apps/CA.pl really looks at # Because that's what ../apps/CA.pl really looks at
$ENV{SSLEAY_CONFIG} = "-config ".$ENV{OPENSSL_CONF}; $ENV{SSLEAY_CONFIG} = "-config ".$ENV{OPENSSL_CONF};
...@@ -132,89 +79,114 @@ indir "tsa" => sub { ...@@ -132,89 +79,114 @@ indir "tsa" => sub {
$testtsa = top_file("test", "recipes", "80-test_tsa.t"); $testtsa = top_file("test", "recipes", "80-test_tsa.t");
$CAtsa = top_file("test", "CAtsa.cnf"); $CAtsa = top_file("test", "CAtsa.cnf");
plan tests => 20; SKIP: {
$ENV{TSDNSECT} = "ts_ca_dn";
SKIP: { skip "failed", 19
skip "failed", 19 unless ok(run(app(["openssl", "req", "-new", "-x509", "-nodes",
if !subtest 'creating CA for TSA tests' => sub { create_ca }; "-out", "tsaca.pem", "-keyout", "tsacakey.pem"])),
'creating a new CA for the TSA tests');
skip "failed", 18
if !subtest 'creating tsa_cert1.pem TSA server cert' => sub { skip "failed", 18
create_tsa_cert("1", "tsa_cert") unless subtest 'creating tsa_cert1.pem TSA server cert' => sub {
}; create_tsa_cert("1", "tsa_cert")
};
skip "failed", 17
if !subtest 'creating tsa_cert2.pem non-TSA server cert' => sub { skip "failed", 17
create_tsa_cert("2", "non_tsa_cert") unless subtest 'creating tsa_cert2.pem non-TSA server cert' => sub {
}; create_tsa_cert("2", "non_tsa_cert")
};
skip "failed", 16
if !subtest 'creating req1.req time stamp request for file testtsa' => sub { skip "failed", 16
create_time_stamp_request1() unless ok(run(app([@RUN, "-query", "-data", $testtsa,
}; "-policy", "tsa_policy1", "-cert",
"-out", "req1.tsq"])),
subtest 'printing req1.req' => sub { 'creating req1.req time stamp request for file testtsa');
print_request("req1.tsq")
}; ok(run(app([@RUN, "-query", "-in", "req1.tsq", "-text"])),
'printing req1.req');
subtest 'generating valid response for req1.req' => sub {
create_time_stamp_response("req1.tsq", "resp1.tsr", "tsa_config1") subtest 'generating valid response for req1.req' => sub {
}; create_time_stamp_response("req1.tsq", "resp1.tsr", "tsa_config1")
};
subtest 'printing response' => sub {
print_response("resp1.tsr") ok(run(app([@RUN, "-reply", "-in", "resp1.tsr", "-text"])),
}; 'printing response');
subtest 'verifying valid response' => sub { subtest 'verifying valid response' => sub {
verify_time_stamp_response("req1.tsq", "resp1.tsr", $testtsa) verify_time_stamp_response("req1.tsq", "resp1.tsr", $testtsa)
}; };
subtest 'verifying valid token' => sub { skip "failed", 11
verify_time_stamp_token("req1.tsq", "resp1.tsr", $testtsa) unless subtest 'verifying valid token' => sub {
}; ok(run(app([@RUN, "-reply", "-in", "resp1.tsr",
"-out", "resp1.tsr.token", "-token_out"])));
subtest 'creating req2.req time stamp request for file testtsa' => sub { ok(run(app([@RUN, "-verify", "-queryfile", "req1.tsq",
create_time_stamp_request2() "-in", "resp1.tsr.token", "-token_in",
}; "-CAfile", "tsaca.pem",
"-untrusted", "tsa_cert1.pem"])));
subtest 'printing req2.req' => sub { ok(run(app([@RUN, "-verify", "-data", $testtsa,
print_request("req2.tsq") "-in", "resp1.tsr.token", "-token_in",
}; "-CAfile", "tsaca.pem",
"-untrusted", "tsa_cert1.pem"])));
subtest 'generating valid response for req2.req' => sub { };
create_time_stamp_response("req2.tsq", "resp2.tsr", "tsa_config1")
}; skip "failed", 10
unless ok(run(app([@RUN, "-query", "-data", $testtsa,
subtest 'checking -token_in and -token_out options with -reply' => sub { "-policy", "tsa_policy2", "-no_nonce",
time_stamp_response_token_test("req2.tsq", "resp2.tsr") "-out", "req2.tsq"])),
}; 'creating req2.req time stamp request for file testtsa');
subtest 'printing response' => sub { ok(run(app([@RUN, "-query", "-in", "req2.tsq", "-text"])),
print_response("resp2.tsr") 'printing req2.req');
};
skip "failed", 8
subtest 'verifying valid response' => sub { unless subtest 'generating valid response for req2.req' => sub {
verify_time_stamp_response("req2.tsq", "resp2.tsr", $testtsa) create_time_stamp_response("req2.tsq", "resp2.tsr", "tsa_config1")
}; };
subtest 'verifying response against wrong request, it should fail' => sub { skip "failed", 7
verify_time_stamp_response_fail("req1.tsq", "resp2.tsr") unless subtest 'checking -token_in and -token_out options with -reply' => sub {
}; my $RESPONSE2="resp2.tsr.copy.tsr";
my $TOKEN_DER="resp2.tsr.token.der";
subtest 'verifying response against wrong request, it should fail' => sub {
verify_time_stamp_response_fail("req2.tsq", "resp1.tsr") ok(run(app([@RUN, "-reply", "-in", "resp2.tsr",
}; "-out", "$TOKEN_DER", "-token_out"])));
ok(run(app([@RUN, "-reply", "-in", "$TOKEN_DER",
subtest 'creating req3.req time stamp request for file CAtsa.cnf' => sub { "-token_in", "-out", "$RESPONSE2"])));
create_time_stamp_request3() is(compare($RESPONSE2, "resp2.tsr"), 0);
}; ok(run(app([@RUN, "-reply", "-in", "resp2.tsr",
"-text", "-token_out"])));
subtest 'printing req3.req' => sub { ok(run(app([@RUN, "-reply", "-in", "$TOKEN_DER",
print_request("req3.tsq") "-token_in", "-text", "-token_out"])));
}; ok(run(app([@RUN, "-reply", "-queryfile", "req2.tsq",
"-text", "-token_out"])));
subtest 'verifying response against wrong request, it should fail' => sub { };
verify_time_stamp_response_fail("req3.tsq", "resp1.tsr")
}; ok(run(app([@RUN, "-reply", "-in", "resp2.tsr", "-text"])),
'printing response');
subtest 'verifying valid response' => sub {
verify_time_stamp_response("req2.tsq", "resp2.tsr", $testtsa)
};
subtest 'verifying response against wrong request, it should fail' => sub {
verify_time_stamp_response_fail("req1.tsq", "resp2.tsr")
};
subtest 'verifying response against wrong request, it should fail' => sub {
verify_time_stamp_response_fail("req2.tsq", "resp1.tsr")
};
skip "failure", 2
unless ok(run(app([@RUN, "-query", "-data", $CAtsa,
"-no_nonce", "-out", "req3.tsq"])),
"creating req3.req time stamp request for file CAtsa.cnf");
ok(run(app([@RUN, "-query", "-in", "req3.tsq", "-text"])),
'printing req3.req');
subtest 'verifying response against wrong request, it should fail' => sub {
verify_time_stamp_response_fail("req3.tsq", "resp1.tsr")
};
} }
}, cleanup => 1, create => 1; }, create => 1, cleanup => 1
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或