summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Matuszewski <igor@sequoia-pgp.org>2020-10-06 21:54:42 +0200
committerIgor Matuszewski <igor@sequoia-pgp.org>2020-10-06 21:57:36 +0200
commitd6e7a4d92008f030ed8108ae62eb97e37c624e0d (patch)
tree888c277e85f9d5ad8c5f4fd729c724aa41b4339e
parent1e325cb2643388601c292f329c901b311410bd48 (diff)
Don't use OS-specific extensions from memsec
We only ever use {memset, memzero, memeq, memcmp} anyway - don't pull OS-specific functions like mlock.
-rw-r--r--Cargo.lock5
-rw-r--r--ffi/Cargo.toml2
-rw-r--r--ipc/Cargo.toml2
-rw-r--r--openpgp-ffi/Cargo.toml2
-rw-r--r--openpgp/Cargo.toml2
5 files changed, 4 insertions, 9 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 75452cf9..85ade65d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1157,11 +1157,6 @@ name = "memsec"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2af4f95d8737f4ffafbd1fb3c703cdc898868a244a59786793cba0520ebdcbdd"
-dependencies = [
- "getrandom",
- "libc",
- "winapi 0.3.9",
-]
[[package]]
name = "miniz_oxide"
diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml
index 6097ba45..f76c6a61 100644
--- a/ffi/Cargo.toml
+++ b/ffi/Cargo.toml
@@ -30,7 +30,7 @@ sequoia-net = { path = "../net", version = "0.19" }
anyhow = "1"
lazy_static = "1.0.0"
libc = "0.2.33"
-memsec = "0.6"
+memsec = { version = "0.6", default-features = false }
native-tls = "0.2.0"
tokio-core = "0.1"
diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml
index ca029b20..53e6de20 100644
--- a/ipc/Cargo.toml
+++ b/ipc/Cargo.toml
@@ -31,7 +31,7 @@ futures = "0.1"
lalrpop-util = "0.19"
lazy_static = "1.3"
libc = "0.2.33"
-memsec = "0.6"
+memsec = { version = "0.6", default-features = false }
rand = { version = "0.7", default-features = false }
tempfile = "3.0"
thiserror = "1"
diff --git a/openpgp-ffi/Cargo.toml b/openpgp-ffi/Cargo.toml
index 9d612070..38faa85e 100644
--- a/openpgp-ffi/Cargo.toml
+++ b/openpgp-ffi/Cargo.toml
@@ -27,7 +27,7 @@ sequoia-openpgp = { path = "../openpgp", version = "0.19" }
anyhow = "1"
lazy_static = "1.0.0"
libc = "0.2.33"
-memsec = "0.6"
+memsec = { version = "0.6", default-features = false }
[dev-dependencies]
filetime = "0.2"
diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml
index e8cfac8b..78c37b18 100644
--- a/openpgp/Cargo.toml
+++ b/openpgp/Cargo.toml
@@ -36,7 +36,7 @@ idna = "0.2"
lalrpop-util = "0.19"
lazy_static = "1.3"
libc = "0.2"
-memsec = "0.6"
+memsec = { version = "0.6", default-features = false }
nettle = { version = "7", optional = true }
regex = "1"
thiserror = "1"