create workspace with webpki-roots crate

rustls · Dec 6, 2023 · 63aedbb · 63aedbb
1 parent 46b65aa
commit 63aedbb
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 35 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,29 +1,2 @@
-[package]
-name = "webpki-roots"
-version = "0.26.0"
-edition = "2018"
-readme = "README.md"
-license = "MPL-2.0"
-description = "Mozilla's CA root certificates for use with webpki"
-homepage = "https://github.com/rustls/webpki-roots"
-repository = "https://github.com/rustls/webpki-roots"
-
-[dependencies]
-pki-types = { package = "rustls-pki-types", version = "1", default-features = false }
-
-[dev-dependencies]
-chrono = { version = "0.4.26", default-features = false, features = ["clock"] }
-csv = "1.2.2"
-hex = "0.4.3"
-num-bigint = "0.4.3"
-percent-encoding = "2.3"
-rcgen = "0.11.1"
-reqwest = { version = "0.11", features = ["rustls-tls-manual-roots"] }
-ring = "0.17.0"
-rustls-pemfile = "2.0.0"
-rustls = "0.22"
-serde = { version = "1.0.183", features = ["derive"] }
-tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
-webpki = { package = "rustls-webpki", version = "0.102", features = ["alloc"] }
-x509-parser = "0.15.1"
-yasna = "0.5.2"
+[workspace]
+members = ["webpki-roots"]
diff --git a/README.md b/README.md
@@ -1,20 +1,21 @@
-# webpki-roots
-This is a crate containing Mozilla's root certificates for use with
+This workspace contains the crate webpki-roots.
+
+The webpki-roots crate contains Mozilla's root certificates for use with
 the [webpki](https://github.com/rustls/webpki) or
 [rustls](https://github.com/rustls/rustls) crates.
 
-This crate is inspired by [certifi.io](https://certifi.io/en/latest/) and
+The webpki-roots crate is inspired by [certifi.io](https://certifi.io/en/latest/) and
 uses the data provided by the [Common CA Database (CCADB)](https://www.ccadb.org/).
 
 [![webpki-roots](https://github.com/rustls/webpki-roots/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/rustls/webpki-roots/actions/workflows/build.yml)
 [![Crate](https://img.shields.io/crates/v/webpki-roots.svg)](https://crates.io/crates/webpki-roots)
 
 # License
-The underlying data is MPL-licensed, and `src/lib.rs`
+The underlying data is MPL-licensed, and `webpki-roots/src/lib.rs`
 is therefore a derived work.
 
 # Regenerating sources
-Sources are generated in an integration test, in `tests/codegen.rs`. The test
+Sources are generated in an integration test, in `webpki-roots/tests/codegen.rs`. The test
 will fail if the sources are out of date relative to upstream, and update
-`src/lib.rs` if so. The code is generated in deterministic order so changes
+`webpki-roots/src/lib.rs` if so. The code is generated in deterministic order so changes
 to the source should only result from upstream changes.
diff --git a/webpki-roots/Cargo.toml b/webpki-roots/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "webpki-roots"
+version = "0.26.0"
+edition = "2018"
+readme = "README.md"
+license = "MPL-2.0"
+homepage = "https://github.com/rustls/webpki-roots"
+repository = "https://github.com/rustls/webpki-roots"
+description = "Mozilla's CA root certificates for use with webpki"
+
+[dependencies]
+pki-types = { package = "rustls-pki-types", version = "1", default-features = false }
+
+[dev-dependencies]
+chrono = { version = "0.4.26", default-features = false, features = ["clock"] }
+csv = "1.2.2"
+hex = "0.4.3"
+num-bigint = "0.4.3"
+percent-encoding = "2.3"
+rcgen = "0.11.1"
+reqwest = { version = "0.11", features = ["rustls-tls-manual-roots"] }
+ring = "0.17.0"
+rustls-pemfile = "2.0.0"
+rustls = "0.22"
+serde = { version = "1.0.183", features = ["derive"] }
+tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
+webpki = { package = "rustls-webpki", version = "0.102", features = ["alloc"] }
+x509-parser = "0.15.1"
+yasna = "0.5.2"
diff --git a/LICENSE → webpki-roots/LICENSE b/LICENSE → webpki-roots/LICENSE
diff --git a/webpki-roots/README.md b/webpki-roots/README.md
@@ -0,0 +1,20 @@
+# webpki-roots
+This is a crate containing Mozilla's root certificates for use with
+the [webpki](https://github.com/rustls/webpki) or
+[rustls](https://github.com/rustls/rustls) crates.
+
+This crate is inspired by [certifi.io](https://certifi.io/en/latest/) and
+uses the data provided by the [Common CA Database (CCADB)](https://www.ccadb.org/).
+
+[![webpki-roots](https://github.com/rustls/webpki-roots/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/rustls/webpki-roots/actions/workflows/build.yml)
+[![Crate](https://img.shields.io/crates/v/webpki-roots.svg)](https://crates.io/crates/webpki-roots)
+
+# License
+The underlying data is MPL-licensed, and `src/lib.rs`
+is therefore a derived work.
+
+# Regenerating sources
+Sources are generated in an integration test, in `tests/codegen.rs`. The test
+will fail if the sources are out of date relative to upstream, and update
+`src/lib.rs` if so. The code is generated in deterministic order so changes
+to the source should only result from upstream changes.
diff --git a/src/lib.rs → webpki-roots/src/lib.rs b/src/lib.rs → webpki-roots/src/lib.rs
diff --git a/tests/codegen.rs → webpki-roots/tests/codegen.rs b/tests/codegen.rs → webpki-roots/tests/codegen.rs
diff --git a/tests/data/DigiCertGlobalRootCA.pem → ...roots/tests/data/DigiCertGlobalRootCA.pem b/tests/data/DigiCertGlobalRootCA.pem → ...roots/tests/data/DigiCertGlobalRootCA.pem
diff --git a/tests/data/tubitak/inter.der → webpki-roots/tests/data/tubitak/inter.der b/tests/data/tubitak/inter.der → webpki-roots/tests/data/tubitak/inter.der
diff --git a/tests/data/tubitak/root.der → webpki-roots/tests/data/tubitak/root.der b/tests/data/tubitak/root.der → webpki-roots/tests/data/tubitak/root.der
diff --git a/tests/data/tubitak/subj.der → webpki-roots/tests/data/tubitak/subj.der b/tests/data/tubitak/subj.der → webpki-roots/tests/data/tubitak/subj.der
diff --git a/tests/verify.rs → webpki-roots/tests/verify.rs b/tests/verify.rs → webpki-roots/tests/verify.rs