Rename dpe crates to have dpe prefix

Rename crypto, platform, and simulator crates to use dpe-* naming to avoid confusing name collisions.
chipsalliance · Aug 15, 2023 · 1a3a064 · 1a3a064
1 parent 1ac1a48
commit 1a3a064
Show file tree

Hide file tree

Showing 22 changed files with 99 additions and 99 deletions.
diff --git a/crypto/Cargo.lock b/crypto/Cargo.lock
diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
@@ -1,7 +1,7 @@
 # Licensed under the Apache-2.0 license
 
 [package]
-name = "crypto"
+name = "dpe-crypto"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/dpe/Cargo.lock b/dpe/Cargo.lock
diff --git a/dpe/Cargo.toml b/dpe/Cargo.toml
@@ -11,12 +11,12 @@ dpe_profile_p256_sha256 = []
 dpe_profile_p384_sha384 = []
 
 [dependencies]
-crypto = {path = "../crypto"}
-platform = {path = "../platform"}
+dpe-crypto = {path = "../crypto"}
+dpe-platform = {path = "../platform"}
 zerocopy = "0.6.1"
 
 [dev-dependencies]
 asn1 = "0.13.0"
 openssl = "0.10"
 x509-parser = "0.14.0"
-crypto = {path = "../crypto", features = ["deterministic_rand"]}
+dpe-crypto = {path = "../crypto", features = ["deterministic_rand"]}
diff --git a/dpe/src/commands/certify_key.rs b/dpe/src/commands/certify_key.rs
@@ -8,8 +8,8 @@ use crate::{
     x509::{MeasurementData, Name, X509CertWriter},
     DPE_PROFILE, MAX_CERT_SIZE, MAX_HANDLES,
 };
-use crypto::Crypto;
-use platform::{Platform, PlatformError, MAX_CHUNK_SIZE};
+use dpe_crypto::Crypto;
+use dpe_platform::{Platform, PlatformError, MAX_CHUNK_SIZE};
 
 #[repr(C)]
 #[derive(Debug, PartialEq, Eq, zerocopy::FromBytes, zerocopy::AsBytes)]
@@ -165,8 +165,8 @@ mod tests {
         dpe_instance::tests::{TestTypes, SIMULATION_HANDLE, TEST_LOCALITIES},
         support::Support,
     };
-    use crypto::OpensslCrypto;
-    use platform::DefaultPlatform;
+    use dpe_crypto::OpensslCrypto;
+    use dpe_platform::DefaultPlatform;
     use x509_parser::nom::Parser;
     use x509_parser::prelude::X509CertificateParser;
     use x509_parser::prelude::*;

diff --git a/dpe/src/commands/derive_child.rs b/dpe/src/commands/derive_child.rs
@@ -173,8 +173,8 @@ mod tests {
         support::Support,
         MAX_HANDLES,
     };
-    use crypto::OpensslCrypto;
-    use platform::DefaultPlatform;
+    use dpe_crypto::OpensslCrypto;
+    use dpe_platform::DefaultPlatform;
     use zerocopy::AsBytes;
 
     const TEST_DERIVE_CHILD_CMD: DeriveChildCmd = DeriveChildCmd {

diff --git a/dpe/src/commands/extend_tci.rs b/dpe/src/commands/extend_tci.rs
@@ -48,8 +48,8 @@ mod tests {
         dpe_instance::tests::{TestTypes, SIMULATION_HANDLE, TEST_LOCALITIES},
         support::Support,
     };
-    use crypto::OpensslCrypto;
-    use platform::{DefaultPlatform, AUTO_INIT_LOCALITY};
+    use dpe_crypto::OpensslCrypto;
+    use dpe_platform::{DefaultPlatform, AUTO_INIT_LOCALITY};
     use zerocopy::AsBytes;
 
     const TEST_EXTEND_TCI_CMD: ExtendTciCmd = ExtendTciCmd {

diff --git a/dpe/src/commands/get_certificate_chain.rs b/dpe/src/commands/get_certificate_chain.rs
@@ -5,7 +5,7 @@ use crate::{
     response::{DpeErrorCode, GetCertificateChainResp, Response, ResponseHdr},
     MAX_CERT_SIZE,
 };
-use platform::{Platform, PlatformError, MAX_CHUNK_SIZE};
+use dpe_platform::{Platform, PlatformError, MAX_CHUNK_SIZE};
 
 #[repr(C)]
 #[derive(Debug, PartialEq, Eq, zerocopy::FromBytes)]
@@ -51,8 +51,8 @@ mod tests {
         dpe_instance::tests::{TestTypes, TEST_LOCALITIES},
         support::test::SUPPORT,
     };
-    use crypto::OpensslCrypto;
-    use platform::DefaultPlatform;
+    use dpe_crypto::OpensslCrypto;
+    use dpe_platform::DefaultPlatform;
     use zerocopy::AsBytes;
 
     const TEST_GET_CERTIFICATE_CHAIN_CMD: GetCertificateChainCmd = GetCertificateChainCmd {

diff --git a/dpe/src/commands/initialize_context.rs b/dpe/src/commands/initialize_context.rs
@@ -96,8 +96,8 @@ mod tests {
         dpe_instance::tests::{TestTypes, TEST_LOCALITIES},
         support::Support,
     };
-    use crypto::OpensslCrypto;
-    use platform::DefaultPlatform;
+    use dpe_crypto::OpensslCrypto;
+    use dpe_platform::DefaultPlatform;
     use zerocopy::AsBytes;
 
     const TEST_INIT_CTX_CMD: InitCtxCmd = InitCtxCmd { flags: 0x1234_5678 };

diff --git a/dpe/src/commands/rotate_context.rs b/dpe/src/commands/rotate_context.rs
@@ -65,8 +65,8 @@ mod tests {
         dpe_instance::tests::{TestTypes, SIMULATION_HANDLE, TEST_HANDLE, TEST_LOCALITIES},
         support::Support,
     };
-    use crypto::OpensslCrypto;
-    use platform::DefaultPlatform;
+    use dpe_crypto::OpensslCrypto;
+    use dpe_platform::DefaultPlatform;
     use zerocopy::AsBytes;
 
     const TEST_ROTATE_CTX_CMD: RotateCtxCmd = RotateCtxCmd {

diff --git a/dpe/src/commands/sign.rs b/dpe/src/commands/sign.rs
@@ -6,7 +6,7 @@ use crate::{
     response::{DpeErrorCode, Response, ResponseHdr, SignResp},
     DPE_PROFILE,
 };
-use crypto::{Crypto, CryptoBuf, Digest, EcdsaSig, HmacSig};
+use dpe_crypto::{Crypto, CryptoBuf, Digest, EcdsaSig, HmacSig};
 
 #[repr(C)]
 #[derive(Debug, PartialEq, Eq, zerocopy::FromBytes)]
@@ -122,10 +122,10 @@ mod tests {
         dpe_instance::tests::{TestTypes, SIMULATION_HANDLE, TEST_LOCALITIES},
         support::{test::SUPPORT, Support},
     };
-    use crypto::OpensslCrypto;
+    use dpe_crypto::OpensslCrypto;
+    use dpe_platform::DefaultPlatform;
     use openssl::x509::X509;
     use openssl::{bn::BigNum, ecdsa::EcdsaSig};
-    use platform::DefaultPlatform;
     use zerocopy::AsBytes;
 
     #[cfg(feature = "dpe_profile_p256_sha256")]

diff --git a/dpe/src/commands/tag_tci.rs b/dpe/src/commands/tag_tci.rs
@@ -57,8 +57,8 @@ mod tests {
         dpe_instance::tests::{TestTypes, SIMULATION_HANDLE, TEST_HANDLE, TEST_LOCALITIES},
         support::Support,
     };
-    use crypto::OpensslCrypto;
-    use platform::DefaultPlatform;
+    use dpe_crypto::OpensslCrypto;
+    use dpe_platform::DefaultPlatform;
     use zerocopy::AsBytes;
 
     const TEST_TAG_TCI_CMD: TagTciCmd = TagTciCmd {

diff --git a/dpe/src/dpe_instance.rs b/dpe/src/dpe_instance.rs
@@ -13,8 +13,8 @@ use crate::{
     DPE_PROFILE, INTERNAL_INPUT_INFO_SIZE, MAX_HANDLES,
 };
 use core::mem::size_of;
-use crypto::{Crypto, Digest, Hasher};
-use platform::{Platform, MAX_CHUNK_SIZE};
+use dpe_crypto::{Crypto, Digest, Hasher};
+use dpe_platform::{Platform, MAX_CHUNK_SIZE};
 use zerocopy::AsBytes;
 
 pub trait DpeTypes {
@@ -394,8 +394,8 @@ pub mod tests {
     use crate::response::NewHandleResp;
     use crate::support::test::SUPPORT;
     use crate::{commands::CommandHdr, CURRENT_PROFILE_MAJOR_VERSION};
-    use crypto::OpensslCrypto;
-    use platform::{DefaultPlatform, AUTO_INIT_LOCALITY, MAX_CHUNK_SIZE, TEST_CERT_CHAIN};
+    use dpe_crypto::OpensslCrypto;
+    use dpe_platform::{DefaultPlatform, AUTO_INIT_LOCALITY, MAX_CHUNK_SIZE, TEST_CERT_CHAIN};
     use zerocopy::AsBytes;
 
     pub struct TestTypes;

diff --git a/dpe/src/lib.rs b/dpe/src/lib.rs
@@ -48,10 +48,10 @@ impl DpeProfile {
     pub const fn get_hash_size(&self) -> usize {
         self.get_tci_size()
     }
-    pub const fn alg_len(&self) -> crypto::AlgLen {
+    pub const fn alg_len(&self) -> dpe_crypto::AlgLen {
         match self {
-            DpeProfile::P256Sha256 => crypto::AlgLen::Bit256,
-            DpeProfile::P384Sha384 => crypto::AlgLen::Bit384,
+            DpeProfile::P256Sha256 => dpe_crypto::AlgLen::Bit256,
+            DpeProfile::P384Sha384 => dpe_crypto::AlgLen::Bit384,
         }
     }
 }

diff --git a/dpe/src/x509.rs b/dpe/src/x509.rs
@@ -10,7 +10,7 @@ use crate::{
     tci::{TciMeasurement, TciNodeData},
     DpeProfile, DPE_PROFILE,
 };
-use crypto::{EcdsaPub, EcdsaSig};
+use dpe_crypto::{EcdsaPub, EcdsaSig};
 
 /// Type for specifying an X.509 RelativeDistinguisedName
 ///
@@ -1119,7 +1119,7 @@ mod tests {
     use crate::tci::{TciMeasurement, TciNodeData};
     use crate::x509::{MeasurementData, Name, X509CertWriter};
     use crate::DPE_PROFILE;
-    use crypto::{AlgLen, CryptoBuf, EcdsaPub, EcdsaSig};
+    use dpe_crypto::{AlgLen, CryptoBuf, EcdsaPub, EcdsaSig};
     use std::str;
     use x509_parser::certificate::X509CertificateParser;
     use x509_parser::nom::Parser;

diff --git a/platform/Cargo.lock b/platform/Cargo.lock
diff --git a/platform/Cargo.toml b/platform/Cargo.toml
@@ -1,6 +1,6 @@
 # Licensed under the Apache-2.0 license
 
 [package]
-name = "platform"
+name = "dpe-platform"
 version = "0.1.0"
 edition = "2021"
diff --git a/simulator/Cargo.lock b/simulator/Cargo.lock