Use Cargo workspace (#78)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: William Woodruff <[email protected]>

.github/dependabot.yml

@@ -23,6 +23,7 @@ updates:
     directories:
       - "/rust"
       - "/rust/tsp-asn1"
+      - "/"
     groups:
       actions:
         patterns:

.gitignore

@@ -1,4 +1,5 @@
 rust/**/target
+target/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

Cargo.toml

@@ -0,0 +1,20 @@
+[workspace]
+resolver = "2"
+
+members = [
+    "rust/",
+    "rust/tsp-asn1",
+]
+
+[workspace.dependencies]
+asn1 = "0.20"
+cryptography-x509 = { git = "https://github.com/pyca/cryptography.git", tag = "44.0.0" }
+hex = "0.4"
+
+[workspace.package]
+version = "0.0.1"
+edition = "2021"
+authors = [
+    "Trail of Bits <[email protected]>"
+]
+publish = false

pyproject.toml

@@ -40,6 +40,7 @@ features = ["pyo3/abi3-py39", "pyo3/extension-module"]
 python-source = "src"
 manifest-path = "rust/Cargo.toml"
 module-name = "rfc3161_client._rust"
+sdist-generator = "git"
 
 [tool.ruff]
 line-length = 100

rust/Cargo.toml

@@ -1,11 +1,9 @@
 [package]
 name = "rfc3161-client"
-version = "0.1.0"
-edition = "2021"
-authors = [
-    "Trail of Bits <[email protected]>"
-]
-publish = false
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+publish.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
@@ -15,12 +13,12 @@ crate-type = ["cdylib"]
 [dependencies]
 tsp-asn1 = { path = "tsp-asn1" }
 pyo3 = { version = "0.23.2", features = ["abi3"] }
-asn1 = "0.20"
+asn1.workspace = true
 self_cell = "1"
-hex = "0.4"
+hex.workspace = true
 sha2 = "0.10.8"
 rand = "0.8.5"
-cryptography-x509 = { git = "https://github.com/pyca/cryptography.git", tag = "44.0.0" }
+cryptography-x509.workspace = true
 openssl = { version = "0.10.68", features = ["vendored"] }
 
 [features]

rust/src/util.rs

@@ -114,6 +114,7 @@ pub fn generate_random_bytes_for_asn1_biguint() -> Vec<u8> {
     }
 }
 
+#[cfg(test)]
 mod tests {
     use super::generate_random_bytes_for_asn1_biguint;
 

rust/tsp-asn1/Cargo.toml

@@ -1,18 +1,16 @@
 [package]
 name = "tsp-asn1"
-version = "0.0.1"
-edition = "2021"
-authors = [
-    "Trail of Bits <[email protected]>"
-]
-publish = false
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+publish.workspace = true
 
 [lib]
 name = "tsp_asn1"
 
 [dependencies]
-asn1 = "0.20"
-cryptography-x509 = { git = "https://github.com/pyca/cryptography.git", tag = "44.0.0" }
+asn1.workspace = true
+cryptography-x509.workspace = true
 
 [dev-dependencies]
-hex = "0.4"
+hex.workspace = true