openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

TEST: Make our test data binary 

Our test data (test/data.txt and test/data2.txt) are text files, but
declaring them binary means that there will be no line ending
transformation done on them.  This is necessary for testing on
non-Unix platforms, where certain tests could otherwise give results
that don't match expected results.

Fixes #13474

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13477)
This commit is contained in:
Richard Levitte 2020-11-23 02:26:34 +01:00
parent a68eee679a
commit c150a94857
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1,3 +1,4 @@
*.bin binary
*.der binary
/fuzz/corpora/** binary
*.pfx binary

0
test/data.txt → test/data.bin
View File

0
test/data2.txt → test/data2.bin
View File

8
test/recipes/20-test_dgst.t
View File

@ -24,8 +24,8 @@ sub tsignverify {
my $privkey = shift;
my $pubkey = shift;
my $data_to_sign = srctop_file('test', 'data.txt');
my $other_data = srctop_file('test', 'data2.txt');
my $data_to_sign = srctop_file('test', 'data.bin');
my $other_data = srctop_file('test', 'data2.bin');
my $sigfile = basename($privkey, '.pem') . '.sig';
plan tests => 4;
@ -106,12 +106,12 @@ SKIP: {
subtest "HMAC generation with `dgst` CLI" => sub {
plan tests => 2;
my $testdata = srctop_file('test', 'data.txt');
my $testdata = srctop_file('test', 'data.bin');
#HMAC the data twice to check consistency
my @hmacdata = run(app(['openssl', 'dgst', '-sha256', '-hmac', '123456',
$testdata, $testdata]), capture => 1);
chomp(@hmacdata);
my $expected = qr/HMAC-SHA256\([^\)]*data.txt\)= 6f12484129c4a761747f13d8234a1ff0e074adb34e9e9bf3a155c391b97b9a7c/;
my $expected = qr/HMAC-SHA256\([^\)]*data.bin\)= 6f12484129c4a761747f13d8234a1ff0e074adb34e9e9bf3a155c391b97b9a7c/;
ok($hmacdata[0] =~ $expected, "HMAC: Check HMAC value is as expected ($hmacdata[0]) vs ($expected)");
ok($hmacdata[1] =~ $expected,
"HMAC: Check second HMAC value is consistent with the first ($hmacdata[1]) vs ($expected)");

4
test/recipes/20-test_pkeyutl.t
View File

@ -75,8 +75,8 @@ sub tsignverify {
my $pubkey = shift;
my @extraopts = @_;
my $data_to_sign = srctop_file('test', 'data.txt');
my $other_data = srctop_file('test', 'data2.txt');
my $data_to_sign = srctop_file('test', 'data.bin');
my $other_data = srctop_file('test', 'data2.bin');
my $sigfile = basename($privkey, '.pem') . '.sig';
my @args = ();