cmpv2: reunite with workspace

Author: baloo

.github/workflows/cmpv2.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

Cargo.lock

@@ -4,7 +4,7 @@ members = [
     "base16ct",
     "base32ct",
     #"base64ct",
-    #"cmpv2",
+    "cmpv2",
     "cms",
     "const-oid",
     "crmf",
@@ -29,7 +29,6 @@ members = [
 ]
 exclude = [
     "base64ct",
-    "cmpv2",
     "gss-api",
     "pkcs12",
     "x509-tsp",
@@ -46,7 +45,7 @@ opt-level = 2
 base16ct = { path = "./base16ct" }
 base32ct = { path = "./base32ct" }
 base64ct = { path = "./base64ct" }
-#cmpv2 = { path = "./cmpv2" }
+cmpv2 = { path = "./cmpv2" }
 cms = { path = "./cms" }
 const-oid = { path = "./const-oid" }
 crmf = { path = "./crmf" }

Cargo.toml

@@ -12,8 +12,8 @@ repository = "https://github.com/RustCrypto/formats"
 categories = ["cryptography", "data-structures", "encoding", "no-std"]
 keywords = ["crypto"]
 readme = "README.md"
-edition = "2021"
-rust-version = "1.81"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]
 crmf = "=0.3.0-pre.0"

cmpv2/Cargo.lock

@@ -2,8 +2,8 @@
 
 use alloc::boxed::Box;
 use alloc::vec::Vec;
-use der::asn1::GeneralizedTime;
 use der::Sequence;
+use der::asn1::GeneralizedTime;
 
 use crmf::controls::CertId;
 use x509_cert::{crl::CertificateList, ext::Extensions};

cmpv2/Cargo.toml

@@ -1,14 +1,14 @@
 //! PKIBody type
 
-use der::asn1::Null;
 use der::Choice;
+use der::asn1::Null;
 
 use crmf::request::CertReqMessages;
 use x509_cert::request::CertReq;
 
 use crate::ann::{CaKeyUpdAnnContent, CertAnnContent, CrlAnnContent, RevAnnContent};
 use crate::certified_key_pair::KeyRecRepContent;
-use crate::gen::{GenMsgContent, GenRepContent};
+use crate::gp::{GenMsgContent, GenRepContent};
 use crate::message::PkiMessages;
 use crate::poll::{PollRepContent, PollReqContent};
 use crate::pop::{PopoDecKeyChallContent, PopoDecKeyRespContent};

cmpv2/src/ann.rs

@@ -5,10 +5,10 @@ use der::asn1::{GeneralizedTime, OctetString, Utf8StringRef};
 use der::{Enumerated, Sequence};
 
 use spki::AlgorithmIdentifierOwned;
-use x509_cert::ext::pkix::name::GeneralName;
 use x509_cert::Certificate;
+use x509_cert::ext::pkix::name::GeneralName;
 
-use crate::gen::InfoTypeAndValue;
+use crate::gp::InfoTypeAndValue;
 
 /// The `PKIHeader` type is defined in [RFC 4210 Section 5.1.1].
 ///

cmpv2/src/body.rs

@@ -21,7 +21,7 @@ extern crate std;
 pub mod ann;
 pub mod body;
 pub mod certified_key_pair;
-pub mod gen;
+pub mod gp;
 pub mod header;
 pub mod message;
 pub mod oob;

cmpv2/src/gen.rs renamed to cmpv2/src/gp.rs

@@ -1,8 +1,8 @@
 //! PKIMessage type
 
 use alloc::vec::Vec;
-use der::asn1::BitString;
 use der::Sequence;
+use der::asn1::BitString;
 
 use crate::body::PkiBody;
 use crate::header::{CmpCertificate, PkiHeader};

cmpv2/src/header.rs

@@ -1,7 +1,7 @@
 //! OOB-related types
 
-use der::asn1::BitString;
 use der::Sequence;
+use der::asn1::BitString;
 
 use crmf::controls::CertId;
 use spki::AlgorithmIdentifierOwned;

cmpv2/src/lib.rs

@@ -1,7 +1,7 @@
 //! Parameter types
 
-use der::asn1::OctetString;
 use der::Sequence;
+use der::asn1::OctetString;
 
 use spki::AlgorithmIdentifierOwned;
 

cmpv2/src/message.rs

@@ -2,8 +2,8 @@
 
 use alloc::vec::Vec;
 
-use der::asn1::{OctetString, UintRef};
 use der::Sequence;
+use der::asn1::{OctetString, UintRef};
 
 use spki::AlgorithmIdentifierOwned;
 use x509_cert::ext::pkix::name::GeneralName;

cmpv2/src/oob.rs

@@ -2,8 +2,8 @@
 
 use alloc::vec::Vec;
 
-use der::asn1::{Int, OctetString};
 use der::Sequence;
+use der::asn1::{Int, OctetString};
 
 use crate::{certified_key_pair::CertifiedKeyPair, header::CmpCertificate, status::PkiStatusInfo};
 

cmpv2/src/parameter.rs

@@ -3,7 +3,7 @@
 use crate::header::PkiFreeText;
 use alloc::vec::Vec;
 use der::asn1::{Int, OctetString};
-use der::flagset::{flags, FlagSet};
+use der::flagset::{FlagSet, flags};
 use der::{Enumerated, Sequence};
 
 /// The `PKIStatus` type is defined in [RFC 4210 Section 5.2.3].

cmpv2/src/pop.rs

@@ -5,8 +5,8 @@ use const_oid::ObjectIdentifier;
 use crmf::pop::ProofOfPossession;
 use der::{Decode, Encode};
 use hex_literal::hex;
-use x509_cert::ext::pkix::name::GeneralName;
 use x509_cert::Certificate;
+use x509_cert::ext::pkix::name::GeneralName;
 
 #[test]
 fn cr_req_message_test() {

cmpv2/src/response.rs

@@ -7,8 +7,8 @@ use const_oid::ObjectIdentifier;
 use crmf::pop::ProofOfPossession;
 use der::{Decode, Encode};
 use hex_literal::hex;
-use x509_cert::ext::pkix::name::GeneralName;
 use x509_cert::Certificate;
+use x509_cert::ext::pkix::name::GeneralName;
 
 #[test]
 fn ir_req_header_test() {

cmpv2/src/status.rs

@@ -2,8 +2,8 @@ use cmpv2::body::PkiBody;
 use cmpv2::message::PkiMessage;
 use der::{Decode, Encode};
 use hex_literal::hex;
-use x509_cert::ext::pkix::name::GeneralName;
 use x509_cert::Certificate;
+use x509_cert::ext::pkix::name::GeneralName;
 
 #[test]
 fn p10cr_req_message_test() {