Use workspace metadata for crates

.github/workflows/ci.yml

@@ -198,8 +198,8 @@ jobs:
     - run: cargo test --features fips
       name: Run tests
 
-  test-rpk:
+  test-features:
-    name: Test RPK
+    name: Test features
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
@@ -209,4 +209,8 @@ jobs:
       run: rustup update stable --no-self-update && rustup default stable
       shell: bash
     - run: cargo test --features rpk
-      name: Run tests
+      name: Run `rpk` tests
+    - run: cargo test --features post-quantum
+      name: Run `post-quantum` tests
+    - run: cargo test --features post-quantum,rpk
+      name: Run `post-quantum,rpk` tests

Cargo.toml

@@ -5,4 +5,33 @@ members = [
     "tokio-boring",
     "hyper-boring"
 ]
-resolver = "2"
+resolver = "2"
+
+[workspace.package]
+version = "3.0.0"
+repository = "https://github.com/cloudflare/boring"
+edition = "2021"
+
+[workspace.dependencies]
+boring-sys = { version = "3.0", path = "./boring-sys" }
+boring = { version = "3.0", path = "./boring" }
+tokio-boring = { version = "3.0", path = "./tokio-boring" }
+
+bindgen = { version = "0.65.1", default-features = false, features = ["runtime"] }
+cmake = "0.1"
+fslock = "0.2"
+bitflags = "1.0"
+foreign-types = "0.5"
+lazy_static = "1"
+libc = "0.2"
+hex = "0.4"
+rusty-hook = "^0.11"
+futures = "0.3"
+tokio = { version = "1", features = ["full"] }
+anyhow = "1"
+antidote = "1.0.0"
+http = "0.2"
+hyper = { version = "0.14", default-features = false, features = ["full"] }
+linked_hash_set = "0.1"
+once_cell = "1.0"
+tower-layer = "0.3"

boring-sys/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
 name = "boring-sys"
-version = "2.1.0"
+version = { workspace = true }
 authors = ["Alex Crichton <alex@alexcrichton.com>",
            "Steven Fackler <sfackler@gmail.com>",
            "Ivan Nikulin <ifaaan@gmail.com>"]
 license = "MIT"
 description = "FFI bindings to BoringSSL"
-repository = "https://github.com/cloudflare/boring"
+repository = { workspace = true }
 documentation = "https://docs.rs/boring-sys"
 links = "boringssl"
 readme = "README.md"
 categories = ["cryptography", "external-ffi-bindings"]
-edition = "2021"
+edition = { workspace = true }
 include = [
     "/*.md",
     "/*.toml",
@@ -28,10 +28,9 @@ include = [
     "/scripts"
 ]
 
-[build-dependencies]
+[package.metadata.docs.rs]
-bindgen = { version = "0.65.1", default-features = false, features = ["runtime"] }
+features = ["rpk", "post-quantum"]
-cmake = "0.1"
+rustdoc-args = ["--cfg", "docsrs"]
-fslock = "0.2.1"
 
 [features]
 # Use a FIPS-validated version of boringssl.
@@ -42,3 +41,10 @@ rpk = []
 
 # Enables post-quantum crypto (https://blog.cloudflare.com/post-quantum-for-all/)
 post-quantum = []
+
+[build-dependencies]
+bindgen = { workspace = true }
+cmake = { workspace = true }
+fslock = { workspace = true }
+
+

boring-sys/build.rs

@@ -333,10 +333,17 @@ fn ensure_patches_applied() -> io::Result<()> {
 
     lock_file.lock()?;
 
+    let boring_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(BORING_SSL_PATH);
+
     let mut cmd = Command::new("git");
 
-    cmd.args(["reset", "--hard"])
+    cmd.args(["reset", "--hard"]).current_dir(&boring_dir);
-        .current_dir(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(BORING_SSL_PATH));
+
+    run_command(&mut cmd)?;
+
+    let mut cmd = Command::new("git");
+
+    cmd.args(["clean", "-fdx"]).current_dir(&boring_dir);
 
     run_command(&mut cmd)?;
 

boring-sys/src/lib.rs

@@ -11,6 +11,8 @@
     unused_imports
 )]
 
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+
 use std::convert::TryInto;
 use std::ffi::c_void;
 use std::os::raw::{c_char, c_int, c_uint, c_ulong};
@@ -21,16 +23,6 @@ mod generated {
 }
 pub use generated::*;
 
-#[cfg(feature = "post-quantum")]
-mod ensure_post_quantum_crypto_patch_applied {
-    use super::KYBER512_encap;
-}
-
-#[cfg(feature = "rpk")]
-mod ensure_raw_public_key_patch_applied {
-    use super::SSL_CTX_set_server_raw_public_key_certificate;
-}
-
 #[cfg(target_pointer_width = "64")]
 pub type BN_ULONG = u64;
 #[cfg(target_pointer_width = "32")]

boring/Cargo.toml

@@ -1,26 +1,19 @@
 [package]
 name = "boring"
-version = "2.1.0"
+version = { workspace = true }
 authors = ["Steven Fackler <sfackler@gmail.com>", "Ivan Nikulin <ifaaan@gmail.com>"]
 license = "Apache-2.0"
 description = "BoringSSL bindings"
-repository = "https://github.com/cloudflare/boring"
+repository = { workspace = true }
 documentation = "https://docs.rs/boring"
 readme = "README.md"
 keywords = ["crypto", "tls", "ssl", "dtls"]
 categories = ["cryptography", "api-bindings"]
-edition = "2021"
+edition = { workspace = true }
 
-[dependencies]
+[package.metadata.docs.rs]
-bitflags = "1.0"
+features = ["rpk", "post-quantum"]
-foreign-types = "0.5"
+rustdoc-args = ["--cfg", "docsrs"]
-lazy_static = "1"
-libc = "0.2"
-boring-sys = { version = ">=1.1.0,<3.0.0", path = "../boring-sys" }
-
-[dev-dependencies]
-hex = "0.4"
-rusty-hook = "^0.11"
 
 [features]
 # Use a FIPS-validated version of boringssl.
@@ -30,4 +23,15 @@ fips = ["boring-sys/fips"]
 rpk = ["boring-sys/rpk"]
 
 # Enables post-quantum crypto (https://blog.cloudflare.com/post-quantum-for-all/)
-post-quantum = ["boring-sys/post-quantum"]
+post-quantum = ["boring-sys/post-quantum"]
+
+[dependencies]
+bitflags = { workspace = true }
+foreign-types = { workspace = true }
+lazy_static = { workspace = true }
+libc = { workspace = true }
+boring-sys = { workspace = true }
+
+[dev-dependencies]
+hex = { workspace = true }
+rusty-hook = { workspace = true }

boring/src/lib.rs

@@ -2,6 +2,8 @@
 //!
 //! This crate provides a safe interface to the BoringSSL cryptography library.
 
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+
 #[macro_use]
 extern crate bitflags;
 #[macro_use]

hyper-boring/Cargo.toml

@@ -1,15 +1,19 @@
 [package]
 name = "hyper-boring"
-version = "2.1.2"
+version = { workspace = true }
 authors = ["Steven Fackler <sfackler@gmail.com>", "Ivan Nikulin <ifaaan@gmail.com>"]
-edition = "2021"
+edition = { workspace = true }
 description = "Hyper TLS support via BoringSSL"
 license = "MIT/Apache-2.0"
-repository = "https://github.com/cloudflare/boring"
+repository = { workspace = true }
 documentation = "https://docs.rs/hyper-boring"
 readme = "README.md"
 exclude = ["test/*"]
 
+[package.metadata.docs.rs]
+features = ["rpk", "post-quantum"]
+rustdoc-args = ["--cfg", "docsrs"]
+
 [features]
 default = ["runtime"]
 
@@ -26,17 +30,17 @@ post-quantum = ["tokio-boring/post-quantum"]
 
 
 [dependencies]
-antidote = "1.0.0"
+antidote = { workspace = true }
-http = "0.2"
+http = { workspace = true }
-hyper = { version = "0.14", default-features = false, features = ["client"] }
+hyper = { workspace = true, features = ["client"] }
-linked_hash_set = "0.1"
+linked_hash_set = { workspace = true }
-once_cell = "1.0"
+once_cell = { workspace = true }
-boring = { version = ">=1.1.0,<3.0.0", path = "../boring" }
+boring = { workspace = true }
-tokio = "1"
+tokio = { workspace = true }
-tokio-boring = { version = "2", path = "../tokio-boring" }
+tokio-boring = { workspace = true }
-tower-layer = "0.3"
+tower-layer = { workspace = true }
 
 [dev-dependencies]
-hyper = { version = "0.14", features = ["full"] }
+hyper = { workspace = true }
-tokio = { version = "1", features = ["full"] }
+tokio = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }

hyper-boring/src/lib.rs

@@ -1,5 +1,6 @@
 //! Hyper SSL support via OpenSSL.
 #![warn(missing_docs)]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
 use crate::cache::{SessionCache, SessionKey};
 use antidote::Mutex;

tokio-boring/Cargo.toml

@@ -1,25 +1,19 @@
 [package]
 name = "tokio-boring"
-version = "2.1.5"
+version = { workspace = true }
 authors = ["Alex Crichton <alex@alexcrichton.com>", "Ivan Nikulin <ifaaan@gmail.com>"]
 license = "MIT/Apache-2.0"
-edition = "2021"
+edition = { workspace = true }
-repository = "https://github.com/cloudflare/boring"
+repository = { workspace = true }
 homepage = "https://github.com/cloudflare/boring"
 documentation = "https://docs.rs/tokio-boring"
 description = """
 An implementation of SSL streams for Tokio backed by BoringSSL
 """
 
-[dependencies]
+[package.metadata.docs.rs]
-boring = { version = ">=1.1.0,<3.0.0", path = "../boring" }
+features = ["rpk", "post-quantum"]
-boring-sys = { version = ">=1.1.0,<3.0.0", path = "../boring-sys" }
+rustdoc-args = ["--cfg", "docsrs"]
-tokio = "1"
-
-[dev-dependencies]
-futures = "0.3"
-tokio = { version = "1", features = ["full"] }
-anyhow = "1"
 
 [features]
 # Use a FIPS-validated version of boringssl.
@@ -30,3 +24,14 @@ rpk = ["boring/rpk"]
 
 # Enables post-quantum crypto (https://blog.cloudflare.com/post-quantum-for-all/)
 post-quantum = ["boring/post-quantum"]
+
+[dependencies]
+boring = { workspace = true }
+boring-sys = { workspace = true }
+tokio = { workspace = true }
+
+[dev-dependencies]
+futures = { workspace = true }
+tokio = { workspace = true }
+anyhow = { workspace = true }
+

tokio-boring/src/lib.rs

@@ -11,6 +11,7 @@
 //! [`boring`] crate, on which this crate is built. Configuration of TLS parameters is still
 //! primarily done through the [`boring`] crate.
 #![warn(missing_docs)]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
 use boring::ssl::{
     self, ConnectConfiguration, ErrorCode, MidHandshakeSslStream, ShutdownResult, SslAcceptor,