Remove top-level facade crateigor/reorganize-workspace

We can select crypto backend either via the root package feature or by
using regular openpgp feature if we build only that package.

10 files changed, 28 insertions, 23 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 1292c2d1..6ed0cde0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,20 +23,25 @@ maintenance = { status = "actively-developed" }
 [workspace]
 
 [dependencies]
-buffered-reader = { path = "buffered-reader", version = "0.18" }
-sequoia-openpgp = { path = "openpgp", version = "0.19" }
-sequoia-openpgp-ffi = { path = "openpgp-ffi", version = "0.19" }
-sequoia-autocrypt = { path = "autocrypt", version = "0.19" }
-sequoia-core = { path = "core", version = "0.19" }
-sequoia-ffi = { path = "ffi", version = "0.19" }
-sequoia-ffi-macros = { path = "ffi-macros", version = "0.19" }
-sequoia-ipc = { path = "ipc", version = "0.19" }
-sequoia-net = { path = "net", version = "0.19" }
-sequoia-store = { path = "store", version = "0.19" }
-sequoia-tool = { path = "tool", version = "0.19" }
-sequoia-sop = { path = "sop", version = "0.19" }
-sequoia-sqv = { path = "sqv", version = "0.19" }
-sequoia-guide = { path = "guide", version = "0.19" }
+buffered-reader = { path = "buffered-reader" }
+sequoia-openpgp = { path = "openpgp", default-features = false }
+sequoia-openpgp-ffi = { path = "openpgp-ffi" }
+sequoia-autocrypt = { path = "autocrypt" }
+sequoia-core = { path = "core" }
+sequoia-ffi = { path = "ffi" }
+sequoia-ffi-macros = { path = "ffi-macros" }
+sequoia-ipc = { path = "ipc" }
+sequoia-net = { path = "net" }
+sequoia-store = { path = "store" }
+sequoia-tool = { path = "tool" }
+sequoia-sop = { path = "sop" }
+sequoia-sqv = { path = "sqv" }
+sequoia-guide = { path = "guide" }
+
+[features]
+default = ["crypto-nettle"]
+crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
+crypto-cng = ["sequoia-openpgp/crypto-cng"]
 
 [lib]
 name = "sequoia"
diff --git a/autocrypt/Cargo.toml b/autocrypt/Cargo.toml
index 208fed6b..8eaf5ad4 100644
--- a/autocrypt/Cargo.toml
+++ b/autocrypt/Cargo.toml
@@ -21,5 +21,5 @@ gitlab = { repository = "sequoia-pgp/sequoia" }
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-sequoia-openpgp = { path = "../openpgp", version = "0.19" }
+sequoia-openpgp = { path = "../openpgp", version = "0.19", default-features = false }
 base64 = ">= 0.11, < 0.13"
diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml
index 295fdd84..5efe2ff5 100644
--- a/ffi/Cargo.toml
+++ b/ffi/Cargo.toml
@@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 sequoia-ffi-macros = { path = "../ffi-macros", version = "0.19" }
-sequoia-openpgp = { path = "../openpgp", version = "0.19" }
+sequoia-openpgp = { path = "../openpgp", version = "0.19", default-features = false }
 sequoia-core = { path = "../core", version = "0.19" }
 sequoia-store = { path = "../store", version = "0.19" }
 sequoia-net = { path = "../net", version = "0.19" }
diff --git a/guide/Cargo.toml b/guide/Cargo.toml
index 91b0df33..09debfc3 100644
--- a/guide/Cargo.toml
+++ b/guide/Cargo.toml
@@ -12,5 +12,5 @@ repository = "https://gitlab.com/sequoia-pgp/sequoia"
 build = "build.rs"
 
 [dependencies]
-sequoia-openpgp = { path = "../openpgp", version = "0.19" }
+sequoia-openpgp = { path = "../openpgp", version = "0.19", default-features = false }
 anyhow = "1"
diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml
index 02a987d7..4d2fd5c9 100644
--- a/ipc/Cargo.toml
+++ b/ipc/Cargo.toml
@@ -20,7 +20,7 @@ gitlab = { repository = "sequoia-pgp/sequoia" }
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-sequoia-openpgp = { path = "../openpgp", version = "0.19" }
+sequoia-openpgp = { path = "../openpgp", version = "0.19", default-features = false }
 sequoia-core = { path = "../core", version = "0.19" }
 
 anyhow = "1"
diff --git a/openpgp-ffi/Cargo.toml b/openpgp-ffi/Cargo.toml
index 565d5526..7f29a874 100644
--- a/openpgp-ffi/Cargo.toml
+++ b/openpgp-ffi/Cargo.toml
@@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 sequoia-ffi-macros = { path = "../ffi-macros", version = "0.19" }
-sequoia-openpgp = { path = "../openpgp", version = "0.19" }
+sequoia-openpgp = { path = "../openpgp", version = "0.19", default-features = false }
 anyhow = "1"
 lazy_static = "1.0.0"
 libc = "0.2.33"
diff --git a/sop/Cargo.toml b/sop/Cargo.toml
index 5386ba15..fdb6ae87 100644
--- a/sop/Cargo.toml
+++ b/sop/Cargo.toml
@@ -19,7 +19,7 @@ gitlab = { repository = "sequoia-pgp/sequoia" }
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-sequoia-openpgp = { path = "../openpgp", version = "0.19" }
+sequoia-openpgp = { path = "../openpgp", version = "0.19", default-features = false }
 anyhow = "1"
 chrono = "0.4"
 structopt = { version = "0.3.8", default-features = false }
diff --git a/sqv/Cargo.toml b/sqv/Cargo.toml
index 44274919..78f0de24 100644
--- a/sqv/Cargo.toml
+++ b/sqv/Cargo.toml
@@ -21,7 +21,7 @@ gitlab = { repository = "sequoia-pgp/sequoia" }
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-sequoia-openpgp = { path = "../openpgp", version = "0.19", default-features = false, features = ["crypto-nettle"] }
+sequoia-openpgp = { path = "../openpgp", version = "0.19", default-features = false }
 anyhow = "1"
 chrono = "0.4"
 clap = "2.32.0"
diff --git a/store/Cargo.toml b/store/Cargo.toml
index 73536f76..d45ef118 100644
--- a/store/Cargo.toml
+++ b/store/Cargo.toml
@@ -26,7 +26,7 @@ default = ["background-services"]
 background-services = []
 
 [dependencies]
-sequoia-openpgp = { path = "../openpgp", version = "0.19" }
+sequoia-openpgp = { path = "../openpgp", version = "0.19", default-features = false }
 sequoia-core = { path = "../core", version = "0.19" }
 sequoia-ipc = { path = "../ipc", version = "0.19" }
 sequoia-net = { path = "../net", version = "0.19" }
diff --git a/tool/Cargo.toml b/tool/Cargo.toml
index b4e4e035..d55be075 100644
--- a/tool/Cargo.toml
+++ b/tool/Cargo.toml
@@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 buffered-reader = { path = "../buffered-reader", version = "0.18" }
-sequoia-openpgp = { path = "../openpgp", version = "0.19" }
+sequoia-openpgp = { path = "../openpgp", version = "0.19", default-features = false }
 sequoia-autocrypt = { path = "../autocrypt", version = "0.19" }
 sequoia-core = { path = "../core", version = "0.19" }
 sequoia-ipc = { path = "../ipc", version = "0.19" }