From f7868c926bfc8376172a9a74210a6e3d7387b5d4 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Fri, 19 Jul 2019 18:44:45 +0200 Subject: openpgp: Add features 'vendored' and 'vendored-nettle'. --- Cargo.lock | 30 ++++++++++++++++++++---------- openpgp/Cargo.toml | 6 +++++- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ddbccd6a..c1223e5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1029,21 +1029,30 @@ dependencies = [ [[package]] name = "nettle" -version = "5.0.2" +version = "5.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", - "nettle-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "nettle-sys 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "nettle-src" +version = "3.5.1-0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "nettle-sys" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bindgen 0.47.3 (registry+https://github.com/rust-lang/crates.io-index)", + "nettle-src 3.5.1-0 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1617,7 +1626,7 @@ dependencies = [ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", "memsec 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "nettle 5.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "nettle 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "sequoia-core 0.9.0", "sequoia-ffi-macros 0.9.0", "sequoia-net 0.9.0", @@ -1678,7 +1687,7 @@ dependencies = [ "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "nettle 5.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "nettle 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "sequoia-core 0.9.0", @@ -1704,7 +1713,7 @@ dependencies = [ "lalrpop-util 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "memsec 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "nettle 5.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "nettle 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "quickcheck 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1721,7 +1730,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", "memsec 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "nettle 5.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "nettle 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "sequoia-ffi-macros 0.9.0", "sequoia-openpgp 0.9.0", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2487,8 +2496,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" -"checksum nettle 5.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac979d8788cec26c5b3812ea1c1fbb23cd86b9ce8c17f9a944135d845643f1c6" -"checksum nettle-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33edac595bd6993d5d6df9879baac6a9d8c671427419c9ad3079b0f4b287e9dd" +"checksum nettle 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c40aad15a496df1ae843b5ca10cef328e64d04854404464f464fd5e11aa6d77d" +"checksum nettle-src 3.5.1-0 (registry+https://github.com/rust-lang/crates.io-index)" = "b7a7edc4649e09f7d8f3644786ccabef3bd8ffa9b3b0c9830f6cf0c9ff42e6b1" +"checksum nettle-sys 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ba2d78d13ac7f81027fd80be4f499ad395335cb0749d4ab206c8b9d9c9dec2d6" "checksum new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30" "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml index d0a270f2..fa78ce40 100644 --- a/openpgp/Cargo.toml +++ b/openpgp/Cargo.toml @@ -32,7 +32,7 @@ idna = "0.1" lalrpop-util = "0.17" lazy_static = "1.3" memsec = "0.5.6" -nettle = "5.0" +nettle = "5.0.2" quickcheck = "0.8" rand = "0.6" time = "0.1.40" @@ -51,3 +51,7 @@ default = ["compression"] compression = ["compression-deflate", "compression-bzip2"] compression-deflate = ["flate2", "buffered-reader/compression-deflate"] compression-bzip2 = ["bzip2", "buffered-reader/compression-bzip2"] + +# Vendoring. +vendored = ["vendored-nettle"] +vendored-nettle = ["nettle/vendored"] -- cgit v1.2.3