RustCrypto · tarcieri · Jul 26, 2024 · Jul 26, 2024
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,7 @@ members = [
     "const-oid",
     "crmf",
     "der",
-    "der/derive",
+    "der_derive",
     "gss-api",
     "pem-rfc7468",
     "pkcs1",
@@ -35,29 +35,29 @@ opt-level = 2
 # A global patch crates-io block is used to avoid cyclic dependencies errors
 # If we use other crates from the RustCrypto ecosystem, they may pull redundant
 # versions of dependencies.
-base16ct          = { path = "./base16ct" }
-base32ct          = { path = "./base32ct" }
-base64ct          = { path = "./base64ct" }
-cmpv2             = { path = "./cmpv2" }
-cms               = { path = "./cms" }
-const-oid         = { path = "./const-oid" }
-crmf              = { path = "./crmf" }
-der               = { path = "./der" }
-der_derive        = { path = "./der/derive" }
-pem-rfc7468       = { path = "./pem-rfc7468" }
-pkcs1             = { path = "./pkcs1" }
-pkcs5             = { path = "./pkcs5" }
-pkcs8             = { path = "./pkcs8" }
-pkcs12            = { path = "./pkcs12" }
-sec1              = { path = "./sec1" }
-serdect           = { path = "./serdect" }
-spki              = { path = "./spki" }
-tai64             = { path = "./tai64" }
-tls_codec         = { path = "./tls_codec" }
-tls_codec_derive  = { path = "./tls_codec/derive" }
-x509-tsp               = { path = "./x509-tsp" }
-x509-cert         = { path = "./x509-cert" }
-x509-ocsp         = { path = "./x509-ocsp" }
+base16ct = { path = "./base16ct" }
+base32ct = { path = "./base32ct" }
+base64ct = { path = "./base64ct" }
+cmpv2 = { path = "./cmpv2" }
+cms = { path = "./cms" }
+const-oid = { path = "./const-oid" }
+crmf = { path = "./crmf" }
+der = { path = "./der" }
+der_derive = { path = "./der_derive" }
+pem-rfc7468 = { path = "./pem-rfc7468" }
+pkcs1 = { path = "./pkcs1" }
+pkcs5 = { path = "./pkcs5" }
+pkcs8 = { path = "./pkcs8" }
+pkcs12 = { path = "./pkcs12" }
+sec1 = { path = "./sec1" }
+serdect = { path = "./serdect" }
+spki = { path = "./spki" }
+tai64 = { path = "./tai64" }
+tls_codec = { path = "./tls_codec" }
+tls_codec_derive = { path = "./tls_codec/derive" }
+x509-tsp = { path = "./x509-tsp" }
+x509-cert = { path = "./x509-cert" }
+x509-ocsp = { path = "./x509-ocsp" }
 
 
 # Pending a release of 0.14.0-pre.1
@@ -67,7 +67,7 @@ whirlpool = { git = "https://github.com/RustCrypto/hashes.git" }
 # Pending a release of 0.2.0-pre
 cbc = { git = "https://github.com/RustCrypto/block-modes.git" }
 # Pending a release of 0.11.0-pre
-salsa20  = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
+salsa20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
 # Pending a release of 0.11.0-pre
 aes-gcm = { git = "https://github.com/RustCrypto/AEADs.git" }
 aead = { git = "https://github.com/RustCrypto/traits.git" }

diff --git a/der/derive/CHANGELOG.md → der_derive/CHANGELOG.md b/der/derive/CHANGELOG.md → der_derive/CHANGELOG.md
diff --git a/der/derive/Cargo.toml → der_derive/Cargo.toml b/der/derive/Cargo.toml → der_derive/Cargo.toml
@@ -5,7 +5,7 @@ description = "Custom derive support for the `der` crate's `Choice` and `Sequenc
 authors = ["RustCrypto Developers"]
 license = "Apache-2.0 OR MIT"
 documentation = "https://docs.rs/der"
-homepage = "https://github.com/RustCrypto/formats/tree/master/der/derive"
+homepage = "https://github.com/RustCrypto/formats/tree/master/der_derive"
 repository = "https://github.com/RustCrypto/formats"
 categories = ["cryptography", "data-structures", "encoding", "no-std", "parser-implementations"]
 keywords = ["asn1", "der", "crypto", "itu", "pkcs"]

diff --git a/der/derive/LICENSE-APACHE → der_derive/LICENSE-APACHE b/der/derive/LICENSE-APACHE → der_derive/LICENSE-APACHE
diff --git a/der/derive/LICENSE-MIT → der_derive/LICENSE-MIT b/der/derive/LICENSE-MIT → der_derive/LICENSE-MIT
diff --git a/der/derive/README.md → der_derive/README.md b/der/derive/README.md → der_derive/README.md
diff --git a/der/derive/src/asn1_type.rs → der_derive/src/asn1_type.rs b/der/derive/src/asn1_type.rs → der_derive/src/asn1_type.rs
diff --git a/der/derive/src/attributes.rs → der_derive/src/attributes.rs b/der/derive/src/attributes.rs → der_derive/src/attributes.rs
diff --git a/der/derive/src/choice.rs → der_derive/src/choice.rs b/der/derive/src/choice.rs → der_derive/src/choice.rs
diff --git a/der/derive/src/choice/variant.rs → der_derive/src/choice/variant.rs b/der/derive/src/choice/variant.rs → der_derive/src/choice/variant.rs
diff --git a/der/derive/src/enumerated.rs → der_derive/src/enumerated.rs b/der/derive/src/enumerated.rs → der_derive/src/enumerated.rs
diff --git a/der/derive/src/lib.rs → der_derive/src/lib.rs b/der/derive/src/lib.rs → der_derive/src/lib.rs
diff --git a/der/derive/src/sequence.rs → der_derive/src/sequence.rs b/der/derive/src/sequence.rs → der_derive/src/sequence.rs
diff --git a/der/derive/src/sequence/field.rs → der_derive/src/sequence/field.rs b/der/derive/src/sequence/field.rs → der_derive/src/sequence/field.rs
diff --git a/der/derive/src/tag.rs → der_derive/src/tag.rs b/der/derive/src/tag.rs → der_derive/src/tag.rs
diff --git a/der/derive/src/value_ord.rs → der_derive/src/value_ord.rs b/der/derive/src/value_ord.rs → der_derive/src/value_ord.rs
diff --git a/x509-cert/fuzz/Cargo.toml b/x509-cert/fuzz/Cargo.toml
@@ -17,7 +17,7 @@ x509-cert = "*"
 members = ["."]
 
 [patch.crates-io]
-der         = { path = "../../der" }
-der_derive  = { path = "../../der/derive" }
+der = { path = "../../der" }
+der_derive = { path = "../../der_derive" }
 pem-rfc7468 = { path = "../../pem-rfc7468" }
-spki        = { path = "../../spki" }
+spki = { path = "../../spki" }