dice-cert-check: Get const-oid, pem-rfc7468 & x509-cert from crates.io

oxidecomputer · Aug 4, 2023 · 5defaf9 · 5defaf9
1 parent 70d38dc
commit 5defaf9
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 136 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,8 +20,9 @@ env_logger = { version = "0.10", default-features = false }
 hex = { version = "0.4", default-features = false }
 hubpack = "0.1"
 log = { version = "0.4", features = ["std"] }
-p384 = { version = "0.12.0", default-features = false }
+p384 = { version = "0.13", default-features = false }
 pem = { version = "1", default-features = false }
+pem-rfc7468 = { version = "0.7.0", default-features = false }
 ring-compat = { version = "0.6", default-features = false }
 ron = "0.8"
 rpassword = "7.2.0"

diff --git a/dice-cert-check/Cargo.toml b/dice-cert-check/Cargo.toml
@@ -3,23 +3,16 @@ name = "dice-cert-check"
 version = "0.1.0"
 edition = "2021"
 
-# NOTE: We're currently using crates from the main development branch of the
-# rust crypto formats git repo. We do this because:
-# - const-oid doesn't have the OIDs from RFC 8410 in a release yet
-# - the latest x509-cert release has a bug that prevents us from consuming
-#   PEM encoded certs. This has been fixed on the development branch but
-#   hasn't made it into a release yet.
 [dependencies]
 anyhow = { workspace = true, default-features = true }
 clap = { workspace = true, default-features = true, features = ["derive"] }
-const-oid = { git = "https://github.com/RustCrypto/formats" }
+const-oid = { version = "0.9.4", features = ["db"] }
 env_logger = { workspace = true, default-features = true }
-ecdsa = { workspace = true, default-features = true }
 hex = { workspace = true, default-features = true }
 log = { workspace = true, default-features = true, features = ["std"] }
 p384 = { workspace = true, default-features = true }
-pem-rfc7468 = { git = "https://github.com/RustCrypto/formats" }
+pem-rfc7468 = { workspace = true, default-features = true }
 ring-compat = { workspace = true, default-features = true, features = ["std"] }
 sha2 = { workspace = true, default-features = true }
 thiserror = { workspace = true, default-features = true }
-x509-cert = { git = "https://github.com/RustCrypto/formats", features = ["pem", "std"] }
+x509-cert = { workspace = true, default-features = true, features = ["pem"] }