sequoia: update to 0.17.0
Daniel Kahn Gillmor
3 years ago
0 | rust-buffered-reader (0.17.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Package buffered-reader 0.17.0 from crates.io using debcargo 2.4.2 | |
3 | ||
4 | -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Wed, 17 Jun 2020 12:04:10 -0400 | |
5 | ||
0 | 6 | rust-buffered-reader (0.16.0-1) unstable; urgency=medium |
1 | 7 | |
2 | 8 | * Package buffered-reader 0.16.0 from crates.io using debcargo 2.4.2 |
0 | rust-sequoia-openpgp (0.17.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Package sequoia-openpgp 0.17.0 from crates.io using debcargo 2.4.2 | |
3 | ||
4 | -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Wed, 17 Jun 2020 12:13:47 -0400 | |
5 | ||
0 | 6 | rust-sequoia-openpgp (0.16.0-4) unstable; urgency=medium |
1 | 7 | |
2 | 8 | * Package sequoia-openpgp 0.16.0 from crates.io using debcargo 2.4.2 |
0 | 0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
1 | 1 | Upstream-Name: sequoia-openpgp |
2 | 2 | Upstream-Contact: |
3 | Igor Matuszewski <igor@sequoia-pgp.org> | |
3 | 4 | Juga <juga@sequoia-pgp.org> |
4 | 5 | Justus Winter <justus@sequoia-pgp.org> |
5 | 6 | Kai Michaelis <kai@sequoia-pgp.org> |
6 | 7 | Neal H. Walfield <neal@sequoia-pgp.org> |
8 | Nora Widdecke <nora@sequoia-pgp.org> | |
9 | Wiktor Kwapisiewicz <wiktor@sequoia-pgp.org> | |
7 | 10 | Source: https://gitlab.com/sequoia-pgp/sequoia |
8 | 11 | |
9 | 12 | Files: * |
10 | 13 | Copyright: |
14 | 2020 Igor Matuszewski <igor@sequoia-pgp.org> | |
11 | 15 | 2019 Juga <juga@sequoia-pgp.org> |
12 | 2017-2019 Justus Winter <justus@sequoia-pgp.org> | |
13 | 2018-2019 Kai Michaelis <kai@sequoia-pgp.org> | |
14 | 2017-2019 Neal H. Walfield <neal@sequoia-pgp.org> | |
16 | 2017-2020 Justus Winter <justus@sequoia-pgp.org> | |
17 | 2018-2020 Kai Michaelis <kai@sequoia-pgp.org> | |
18 | 2017-2020 Neal H. Walfield <neal@sequoia-pgp.org> | |
19 | 2020 Nora Widdecke <nora@sequoia-pgp.org> | |
20 | 2020 Wiktor Kwapisiewicz <wiktor@sequoia-pgp.org> | |
15 | 21 | License: GPL-2+ |
16 | 22 | |
17 | 23 | Files: debian/* |
0 | 0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
1 | 1 | Upstream-Name: sequoia-openpgp |
2 | 2 | Upstream-Contact: |
3 | Igor Matuszewski <igor@sequoia-pgp.org> | |
3 | 4 | Justus Winter <justus@sequoia-pgp.org> |
4 | 5 | Kai Michaelis <kai@sequoia-pgp.org> |
5 | 6 | Neal H. Walfield <neal@sequoia-pgp.org> |
7 | Nora Widdecke <nora@sequoia-pgp.org> | |
8 | Wiktor Kwapisiewicz <wiktor@sequoia-pgp.org> | |
6 | 9 | Source: https://gitlab.com/sequoia-pgp/sequoia |
7 | 10 | |
8 | 11 | Files: * |
9 | 12 | Copyright: |
13 | FIXME (overlay) UNKNOWN-YEARS Igor Matuszewski <igor@sequoia-pgp.org> | |
10 | 14 | FIXME (overlay) UNKNOWN-YEARS Justus Winter <justus@sequoia-pgp.org> |
11 | 15 | FIXME (overlay) UNKNOWN-YEARS Kai Michaelis <kai@sequoia-pgp.org> |
12 | 16 | FIXME (overlay) UNKNOWN-YEARS Neal H. Walfield <neal@sequoia-pgp.org> |
17 | FIXME (overlay) UNKNOWN-YEARS Nora Widdecke <nora@sequoia-pgp.org> | |
18 | FIXME (overlay) UNKNOWN-YEARS Wiktor Kwapisiewicz <wiktor@sequoia-pgp.org> | |
13 | 19 | License: GPL-2.0-or-later |
14 | 20 | Comment: |
15 | 21 | FIXME (overlay): Since upstream copyright years are not available in |
+0
-67
0 | From 3accc10973272de29f098c5db11951a122238d99 Mon Sep 17 00:00:00 2001 | |
1 | From: Justus Winter <justus@sequoia-pgp.org> | |
2 | Date: Mon, 27 Apr 2020 16:13:33 +0200 | |
3 | Subject: [PATCH] openpgp: Fix tests when building without compression support. | |
4 | ||
5 | - Fixes #495. | |
6 | --- | |
7 | src/parse.rs | 2 ++ | |
8 | src/policy.rs | 4 ++-- | |
9 | .../tests/data/messages/encrypted-to-testy-no-compression.gpg | 1 + | |
10 | 3 files changed, 5 insertions(+), 2 deletions(-) | |
11 | create mode 100644 tests/data/messages/encrypted-to-testy-no-compression.gpg | |
12 | ||
13 | diff --git a/src/parse.rs b/src/parse.rs | |
14 | index c8c42a29..cfcb6b3b 100644 | |
15 | --- a/src/parse.rs | |
16 | +++ b/src/parse.rs | |
17 | @@ -4264,6 +4264,7 @@ mod test { | |
18 | // signed. But what makes these particularly complex is the | |
19 | // use of an indeterminate length encoding, which checks the | |
20 | // buffered_reader::Reserve hack. | |
21 | + #[cfg(feature = "compression-deflate")] | |
22 | DecryptTest { | |
23 | filename: "seip/msg-compression-not-signed-password-123.pgp", | |
24 | algo: SymmetricAlgorithm::AES128, | |
25 | @@ -4277,6 +4278,7 @@ mod test { | |
26 | (Tag::MDC, &[ 1, 1 ]), | |
27 | ], | |
28 | }, | |
29 | + #[cfg(feature = "compression-deflate")] | |
30 | DecryptTest { | |
31 | filename: "seip/msg-compression-signed-password-123.pgp", | |
32 | algo: SymmetricAlgorithm::AES128, | |
33 | diff --git a/src/policy.rs b/src/policy.rs | |
34 | index 29daed81..884cc702 100644 | |
35 | --- a/src/policy.rs | |
36 | +++ b/src/policy.rs | |
37 | @@ -1846,14 +1846,14 @@ mod test { | |
38 | ||
39 | let p = &P::new(); | |
40 | Decryptor::from_bytes( | |
41 | - p, crate::tests::message("encrypted-to-testy.gpg"), | |
42 | + p, crate::tests::message("encrypted-to-testy-no-compression.gpg"), | |
43 | Helper {}, crate::frozen_time()).unwrap(); | |
44 | ||
45 | // Reject the AES256. | |
46 | let p = &mut P::new(); | |
47 | p.reject_symmetric_algo(SymmetricAlgorithm::AES256); | |
48 | let r = Decryptor::from_bytes( | |
49 | - p, crate::tests::message("encrypted-to-testy.gpg"), | |
50 | + p, crate::tests::message("encrypted-to-testy-no-compression.gpg"), | |
51 | Helper {}, crate::frozen_time()); | |
52 | match r { | |
53 | Ok(_) => panic!(), | |
54 | diff --git a/tests/data/messages/encrypted-to-testy-no-compression.gpg b/tests/data/messages/encrypted-to-testy-no-compression.gpg | |
55 | new file mode 100644 | |
56 | index 00000000..d6920e38 | |
57 | --- /dev/null | |
58 | +++ b/tests/data/messages/encrypted-to-testy-no-compression.gpg | |
59 | @@ -0,0 +1 @@ | |
60 | + IâfÉ&2ÿV GUp¦º£°Â4 ⏎ | |
61 | S›Eβ`Ϊ<Μ,yu14#’ϋ¶xΰΎsϊ1¤]�D2E�…�τO<�/E@o'eώβ#υ"ΌνF tπώ� Π�¦£]οΫ™UΉΟ"ο+wQΟQΜ*�ί@;Τ&p zj�ΧΆ7Φ,ΩΡύ��ϋ¤{μPΕ{ίΎ… ⏎ | |
62 | `úM?Q)èI@\ÅDÂ*®7&9Ù{´µÊ;gåÃ@>±Y°ÂÅÛ»ÉfoãúC,X-¼ Ï]HqYó%_RlLE¼w£u."ys½'®E* h$qeÖ;nã¥,·ÂpÝþKôÒ>l+UYqÏX v31ýٰϲGÞêo&P¥o?ÇÍ1Ìäî|UÀêÌ&%ªî²Lð²´æ | |
63 | \ No newline at end of file | |
64 | -- | |
65 | 2.26.2 | |
66 |
0 | From c72e1b0855795d2fcd914157e1bd64c66bd6b997 Mon Sep 17 00:00:00 2001 | |
1 | From: Justus Winter <justus@sequoia-pgp.org> | |
2 | Date: Tue, 28 Apr 2020 10:50:22 +0200 | |
3 | Subject: [PATCH] openpgp: Fix tests. | |
4 | ||
5 | - Fixes 3accc10973272de29f098c5db11951a122238d99. | |
6 | ||
7 | - Fixes #495. | |
8 | --- | |
9 | src/parse.rs | 2 +- | |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
11 | ||
12 | diff --git a/src/parse.rs b/src/parse.rs | |
13 | index cfcb6b3b..35dcbcc4 100644 | |
14 | --- a/src/parse.rs | |
15 | +++ b/src/parse.rs | |
16 | @@ -4203,7 +4203,7 @@ mod test { | |
17 | plaintext: Data<'a>, | |
18 | paths: &'a[ (Tag, &'a[ usize ] ) ], | |
19 | } | |
20 | - const DECRYPT_TESTS: [DecryptTest; 10] = [ | |
21 | + const DECRYPT_TESTS: &[DecryptTest] = &[ | |
22 | // Messages with a relatively simple structure: | |
23 | // | |
24 | // [ SKESK SEIP [ Literal MDC ] ]. | |
25 | -- | |
26 | 2.26.2 | |
27 |
0 | 0 | --- a/Cargo.toml 1969-12-31 19:00:00.000000000 -0500 |
1 | 1 | +++ b/Cargo.toml 2019-10-23 20:01:27.490868151 -0400 |
2 | @@ -81,7 +81,7 @@ | |
2 | @@ -106,7 +106,7 @@ | |
3 | 3 | compression-deflate = ["flate2", "buffered-reader/compression-deflate"] |
4 | 4 | default = ["compression"] |
5 | 5 | vendored = ["vendored-nettle"] |
6 | 6 | -vendored-nettle = ["nettle/vendored"] |
7 | 7 | +vendored-nettle = [] |
8 | x-quickcheck = ["quickcheck", "rand"] | |
8 | 9 | [badges.gitlab] |
9 | 10 | repository = "sequoia-pgp/sequoia" |
10 |
3 | 3 | commit to that same approach to resolving the concern (debian archive |
4 | 4 | management should handle it for us). |
5 | 5 | |
6 | Furthermore, sequoia-openpgp should also work with base64 version | |
7 | 0.12.*, not just 0.11.*. | |
8 | ||
9 | 6 | Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> |
10 | 7 | |
11 | 8 | --- a/Cargo.toml 2020-04-24 15:13:48.609357466 -0400 |
12 | 9 | +++ b/Cargo.toml 2020-04-24 15:13:59.710831392 -0400 |
13 | @@ -32,7 +32,7 @@ | |
14 | version = "1" | |
15 | ||
16 | [dependencies.base64] | |
17 | -version = "0.11" | |
18 | +version = ">= 0.11, < 0.13" | |
19 | ||
20 | [dependencies.buffered-reader] | |
21 | version = "0.16" | |
22 | @@ -79,9 +79,9 @@ | |
10 | @@ -85,17 +85,17 @@ | |
23 | 11 | version = "1" |
24 | 12 | |
25 | 13 | [dependencies.unicode-normalization] |
26 | 14 | -version = "= 0.1.9" |
27 | 15 | +version = "0.1.9" |
16 | [dev-dependencies.quickcheck] | |
17 | version = "0.9" | |
18 | default-features = false | |
19 | ||
20 | [dev-dependencies.rand] | |
21 | version = "0.7" | |
22 | default-features = false | |
23 | ||
28 | 24 | [dev-dependencies.rpassword] |
29 | 25 | -version = "=4.0.3" |
30 | 26 | +version = "4.0.3" |
0 | 0 | disable-vendor.diff |
1 | 1 | relax-deps.diff |
2 | 0001-openpgp-Fix-tests-when-building-without-compression-.patch | |
3 | 0002-openpgp-Fix-tests.patch |
0 | rust-sequoia-sqv (0.17.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Package sequoia-sqv 0.17.0 from crates.io using debcargo 2.4.2 | |
3 | ||
4 | -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Wed, 17 Jun 2020 16:39:57 -0400 | |
5 | ||
0 | 6 | rust-sequoia-sqv (0.16.0-1) unstable; urgency=medium |
1 | 7 | |
2 | 8 | * Package sequoia-sqv 0.16.0 from crates.io using debcargo 2.4.2 |