1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
Index: sequoia-openpgp/Cargo.toml
===================================================================
--- sequoia-openpgp.orig/Cargo.toml
+++ sequoia-openpgp/Cargo.toml
@@ -71,16 +71,11 @@ compression-deflate = [
]
crypto-botan = [
"dep:botan",
- "botan?/botan3",
]
-crypto-botan2 = ["dep:botan"]
crypto-cng = [
"dep:cipher",
"dep:eax",
- "dep:winapi",
- "dep:win-crypto-ng",
"dep:ed25519",
- "dep:ed25519-dalek",
"dep:num-bigint-dig",
"dep:aes-gcm",
"dep:rand_core",
@@ -104,12 +99,10 @@ crypto-rust = [
"dep:eax",
"dep:ecb",
"dep:ed25519",
- "dep:ed25519-dalek",
"dep:idea",
"dep:md-5",
"dep:num-bigint-dig",
"dep:ripemd",
- "dep:rsa",
"dep:sha2",
"dep:sha3",
"dep:cbc",
@@ -117,11 +110,9 @@ crypto-rust = [
"sha1collisiondetection/oid",
"dep:twofish",
"dep:typenum",
- "dep:x25519-dalek",
"dep:ocb3",
"dep:p256",
"dep:p384",
- "dep:p521",
"dep:rand",
"rand?/getrandom",
"dep:rand_core",
@@ -244,7 +235,7 @@ features = ["zeroize"]
optional = true
[dependencies.botan]
-version = "0.10.6"
+version = "0.12"
optional = true
[dependencies.buffered-reader]
Index: sequoia-openpgp/src/crypto/tests/rsa.rs
===================================================================
--- sequoia-openpgp.orig/src/crypto/tests/rsa.rs
+++ sequoia-openpgp/src/crypto/tests/rsa.rs
@@ -22,6 +22,10 @@ fn p_less_than_q() -> Result<()> {
//
// Note: p and q are swapped, i.e. p < q doesn't hold in the
// arguments of import_secret_rsa:
+ // Debian: botan 3.x doesn't allow the swapped parameters below
+ if cfg!(feature = "crypto-botan") {
+ return Ok(());
+ }
let key1 = Key4::import_secret_rsa(&d0, &q, &p, t)?;
let (d1, p, q, u1) = extract(&key1);
assert_eq!(raw_bigint_cmp(&p, &q), Ordering::Less);
|
