OpenSystemsDevelopment / qpdf

Commit a2c4a2b12a76bd932ba709d9c199a6f1684ba0be

Authored by Jay Berkenbilt
1 parent 7d7e2234

Arbitrarily use new --encrypt syntax for some tests 

Now the tests intermix old and new syntax, ensuring both are
exercised.
Inline Side-by-side
Showing 5 changed files with 11 additions and 11 deletions
qpdf/qtest/cleartext-metadata.test
  View file @a2c4a2b
@@ -31,7 +31,7 @@ foreach my $f (qw(compressed-metadata.pdf enc-base.pdf)) @@ -31,7 +31,7 @@ foreach my $f (qw(compressed-metadata.pdf enc-base.pdf))
31 $td->runtest("encrypt normally", 31 $td->runtest("encrypt normally",
32 {$td->COMMAND => 32 {$td->COMMAND =>
33 "qpdf --allow-weak-crypto" . 33 "qpdf --allow-weak-crypto" .
34 - " --encrypt '' o 128 -- a.pdf b.pdf"}, 34 + " --encrypt --owner-password=o --bits=128 -- a.pdf b.pdf"},
35 {$td->STRING => "", $td->EXIT_STATUS => 0}); 35 {$td->STRING => "", $td->EXIT_STATUS => 0});
36 check_metadata($td, "b.pdf", 1, 0); 36 check_metadata($td, "b.pdf", 1, 0);
37 unlink "b.pdf"; 37 unlink "b.pdf";
@@ -45,7 +45,7 @@ foreach my $f (qw(compressed-metadata.pdf enc-base.pdf)) @@ -45,7 +45,7 @@ foreach my $f (qw(compressed-metadata.pdf enc-base.pdf))
45 $td->runtest("encrypt with cleartext metadata", 45 $td->runtest("encrypt with cleartext metadata",
46 {$td->COMMAND => 46 {$td->COMMAND =>
47 "qpdf --allow-weak-crypto" . 47 "qpdf --allow-weak-crypto" .
48 - " --encrypt '' o 128 --cleartext-metadata --" . 48 + " --encrypt --owner-password=o --bits=128 --cleartext-metadata --" .
49 " a.pdf b.pdf"}, 49 " a.pdf b.pdf"},
50 {$td->STRING => "", $td->EXIT_STATUS => 0}); 50 {$td->STRING => "", $td->EXIT_STATUS => 0});
51 check_metadata($td, "b.pdf", 1, 1); 51 check_metadata($td, "b.pdf", 1, 1);
qpdf/qtest/encryption-parameters.test
  View file @a2c4a2b
@@ -24,7 +24,7 @@ foreach my $file (qw(short-id long-id)) @@ -24,7 +24,7 @@ foreach my $file (qw(short-id long-id))
24 $td->runtest("encrypt $file.pdf", 24 $td->runtest("encrypt $file.pdf",
25 {$td->COMMAND => 25 {$td->COMMAND =>
26 "qpdf --allow-weak-crypto". 26 "qpdf --allow-weak-crypto".
27 - " --encrypt '' pass 40 -- $file.pdf a.pdf"}, 27 + " --encrypt --owner-password=pass --bits=40 -- $file.pdf a.pdf"},
28 {$td->STRING => "", 28 {$td->STRING => "",
29 $td->EXIT_STATUS => 0}, 29 $td->EXIT_STATUS => 0},
30 $td->NORMALIZE_NEWLINES); 30 $td->NORMALIZE_NEWLINES);
qpdf/qtest/encryption.test
  View file @a2c4a2b
@@ -135,7 +135,7 @@ $td->runtest("empty owner password", @@ -135,7 +135,7 @@ $td->runtest("empty owner password",
135 $td->EXIT_STATUS => 2}, 135 $td->EXIT_STATUS => 2},
136 $td->NORMALIZE_NEWLINES); 136 $td->NORMALIZE_NEWLINES);
137 $td->runtest("allow insecure", 137 $td->runtest("allow insecure",
138 - {$td->COMMAND => "qpdf --encrypt u '' 256 --allow-insecure --" . 138 + {$td->COMMAND => "qpdf --encrypt --user-password=u --bits=256 --allow-insecure --" .
139 " minimal.pdf a.pdf"}, 139 " minimal.pdf a.pdf"},
140 {$td->STRING => "", $td->EXIT_STATUS => 0}, 140 {$td->STRING => "", $td->EXIT_STATUS => 0},
141 $td->NORMALIZE_NEWLINES); 141 $td->NORMALIZE_NEWLINES);
@@ -561,7 +561,7 @@ foreach my $d (['--force-V4', 'V4'], @@ -561,7 +561,7 @@ foreach my $d (['--force-V4', 'V4'],
561 my ($args, $out) = @$d; 561 my ($args, $out) = @$d;
562 $td->runtest("encrypt $args", 562 $td->runtest("encrypt $args",
563 {$td->COMMAND => "qpdf --static-aes-iv --static-id" . 563 {$td->COMMAND => "qpdf --static-aes-iv --static-id" .
564 - " --allow-weak-crypto --encrypt '' '' 128 $args --" . 564 + " --allow-weak-crypto --encrypt --bits=128 $args --" .
565 " enc-base.pdf a.pdf"}, 565 " enc-base.pdf a.pdf"},
566 {$td->STRING => "", $td->EXIT_STATUS => 0}); 566 {$td->STRING => "", $td->EXIT_STATUS => 0});
567 $td->runtest("check output", 567 $td->runtest("check output",
qpdf/qtest/signature-dictionary.test
  View file @a2c4a2b
@@ -71,7 +71,7 @@ foreach my $i (qw(40 128 256)) @@ -71,7 +71,7 @@ foreach my $i (qw(40 128 256))
71 } 71 }
72 $td->runtest("encrypt $i", 72 $td->runtest("encrypt $i",
73 {$td->COMMAND => 73 {$td->COMMAND =>
74 - "qpdf $x --encrypt '' o $i --" . 74 + "qpdf $x --encrypt --owner-password=o --bits=$i --" .
75 " digitally-signed.pdf a.pdf"}, 75 " digitally-signed.pdf a.pdf"},
76 {$td->STRING => "", 76 {$td->STRING => "",
77 $td->EXIT_STATUS => 0}); 77 $td->EXIT_STATUS => 0});
@@ -102,7 +102,7 @@ foreach my $i (qw(40 128 256)) @@ -102,7 +102,7 @@ foreach my $i (qw(40 128 256))
102 } 102 }
103 $td->runtest("non sig dict encrypt $i", 103 $td->runtest("non sig dict encrypt $i",
104 {$td->COMMAND => 104 {$td->COMMAND =>
105 - "qpdf $x --encrypt '' o $i --" . 105 + "qpdf $x --encrypt --owner-password=o --bits=$i --" .
106 " comment-annotation.pdf a.pdf"}, 106 " comment-annotation.pdf a.pdf"},
107 {$td->STRING => "", 107 {$td->STRING => "",
108 $td->EXIT_STATUS => 0}); 108 $td->EXIT_STATUS => 0});
qpdf/qtest/weak-cryptography.test
  View file @a2c4a2b
@@ -17,21 +17,21 @@ my $td = new TestDriver('weak-cryptography-cryptography'); @@ -17,21 +17,21 @@ my $td = new TestDriver('weak-cryptography-cryptography');
17 my $n_tests = 4; 17 my $n_tests = 4;
18 18
19 $td->runtest("256-bit: no warning", 19 $td->runtest("256-bit: no warning",
20 - {$td->COMMAND => 'qpdf --encrypt "" "" 256 -- minimal.pdf a.pdf'}, 20 + {$td->COMMAND => 'qpdf --encrypt --bits=256 -- minimal.pdf a.pdf'},
21 {$td->STRING => "", $td->EXIT_STATUS => 0}, 21 {$td->STRING => "", $td->EXIT_STATUS => 0},
22 $td->NORMALIZE_NEWLINES); 22 $td->NORMALIZE_NEWLINES);
23 $td->runtest("128-bit with AES: no warning", 23 $td->runtest("128-bit with AES: no warning",
24 - {$td->COMMAND => 'qpdf --encrypt "" "" 128 --use-aes=y --' . 24 + {$td->COMMAND => 'qpdf --encrypt --bits=128 --use-aes=y --' .
25 ' minimal.pdf a.pdf'}, 25 ' minimal.pdf a.pdf'},
26 {$td->STRING => "", $td->EXIT_STATUS => 0}, 26 {$td->STRING => "", $td->EXIT_STATUS => 0},
27 $td->NORMALIZE_NEWLINES); 27 $td->NORMALIZE_NEWLINES);
28 $td->runtest("128-bit without AES: error", 28 $td->runtest("128-bit without AES: error",
29 - {$td->COMMAND => 'qpdf --encrypt "" "" 128 -- minimal.pdf a.pdf'}, 29 + {$td->COMMAND => 'qpdf --encrypt --bits=128 -- minimal.pdf a.pdf'},
30 {$td->REGEXP => "Pass --allow-weak-crypto to enable", 30 {$td->REGEXP => "Pass --allow-weak-crypto to enable",
31 $td->EXIT_STATUS => 2}, 31 $td->EXIT_STATUS => 2},
32 $td->NORMALIZE_NEWLINES); 32 $td->NORMALIZE_NEWLINES);
33 $td->runtest("40-bit: error", 33 $td->runtest("40-bit: error",
34 - {$td->COMMAND => 'qpdf --encrypt "" "" 40 -- minimal.pdf a.pdf'}, 34 + {$td->COMMAND => 'qpdf --encrypt --bits=40 -- minimal.pdf a.pdf'},
35 {$td->REGEXP => "Pass --allow-weak-crypto to enable", 35 {$td->REGEXP => "Pass --allow-weak-crypto to enable",
36 $td->EXIT_STATUS => 2}, 36 $td->EXIT_STATUS => 2},
37 $td->NORMALIZE_NEWLINES); 37 $td->NORMALIZE_NEWLINES);