x509-tsp: reunite with the workspace

Author: baloo

.github/workflows/x509-tsp.yml

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

Cargo.lock

@@ -22,14 +22,13 @@ members = [
     "tai64",
     "tls_codec",
     "tls_codec/derive",
-    #"x509-tsp",
+    "x509-tsp",
     "x509-cert",
     "x509-cert/test-support",
     #"x509-ocsp"
 ]
 exclude = [
     "base64ct",
-    "x509-tsp",
     "x509-ocsp"
 ]
 
@@ -60,7 +59,7 @@ spki = { path = "./spki" }
 tai64 = { path = "./tai64" }
 tls_codec = { path = "./tls_codec" }
 tls_codec_derive = { path = "./tls_codec/derive" }
-#x509-tsp = { path = "./x509-tsp" }
+x509-tsp = { path = "./x509-tsp" }
 x509-cert = { path = "./x509-cert" }
 #x509-ocsp = { path = "./x509-ocsp" }
 

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "x509-tsp"
 version = "0.2.0-pre"
-edition = "2021"
+edition = "2024"
 description = """
 Pure Rust implementation of the Timestamping Protocol as described in RFC 3161.
 """
@@ -12,7 +12,7 @@ repository = "https://github.com/RustCrypto/formats"
 categories = ["cryptography", "encoding", "no-std", "parser-implementations"]
 keywords = ["crypto", "tsp", "timestamp"]
 readme = "README.md"
-rust-version = "1.81"
+rust-version = "1.85"
 
 [dependencies]
 der = { version = "0.8.0-rc.0", features = ["alloc", "derive", "oid", "pem"] }

x509-tsp/Cargo.toml

@@ -11,12 +11,12 @@ extern crate alloc;
 use cmpv2::status::PkiStatusInfo;
 use cms::content_info::ContentInfo;
 use der::{
+    Any, Enumerated, Sequence,
     asn1::{GeneralizedTime, Int, OctetString},
     oid::ObjectIdentifier,
-    Any, Enumerated, Sequence,
 };
 use x509_cert::{
-    ext::{pkix::name::GeneralName, Extensions},
+    ext::{Extensions, pkix::name::GeneralName},
     spki::AlgorithmIdentifier,
 };
 
@@ -189,7 +189,9 @@ mod tests {
     #[test]
     fn request_test() {
         // openssl ts --query --data abc.txt -out query.tsq
-        let enc_req = hex!("30400201013031300D060960864801650304020105000420BA7816BF8F01CFEA414140DE5DAE2223B00361A396177A9CB410FF61F20015AD0208314CFCE4E0651827");
+        let enc_req = hex!(
+            "30400201013031300D060960864801650304020105000420BA7816BF8F01CFEA414140DE5DAE2223B00361A396177A9CB410FF61F20015AD0208314CFCE4E0651827"
+        );
         let req = TimeStampReq::from_der(&enc_req).unwrap();
         assert_eq!(req.version, TspVersion::V1);
         assert_eq!(req.message_imprint.hash_algorithm.oid, ID_SHA_256);
@@ -202,7 +204,9 @@ mod tests {
     #[test]
     fn response_test() {
         // openssl ts -reply -queryfile query.tsq -signer ec384-tsa-key.crt -inkey ec384-tsa-key.pem -out response.tsr -config tsa.cnf
-        let enc_resp = hex!("3082028430030201003082027B06092A864886F70D010702A082026C30820268020103310F300D060960864801650304020105003081C9060B2A864886F70D0109100104A081B90481B63081B302010106042A0304013031300D060960864801650304020105000420BA7816BF8F01CFEA414140DE5DAE2223B00361A396177A9CB410FF61F20015AD020104180F32303233303630373131323632365A300A020101800201F48101640101FF0208314CFCE4E0651827A048A4463044310B30090603550406130255533113301106035504080C0A536F6D652D5374617465310D300B060355040A0C04546573743111300F06035504030C0854657374205453413182018430820180020101305C3044310B30090603550406130255533113301106035504080C0A536F6D652D5374617465310D300B060355040A0C04546573743111300F06035504030C08546573742054534102146A0DCC59137C11D1C2B092042B4BC51C0D634D24300D06096086480165030402010500A08198301A06092A864886F70D010903310D060B2A864886F70D0109100104301C06092A864886F70D010905310F170D3233303630373131323632365A302B060B2A864886F70D010910020C311C301A3018301604142F36B1B52456F5AC3A1CA09794AE3D0D64AD38C2302F06092A864886F70D01090431220420BAF4CCF82E9B5B3956EADCC87346B407684F26D82B68D0E7DE0D31EA79AF648C300A06082A8648CE3D0403020467306502305A6E1C175B20A93FAB25D14CC5F5A2836D726D6D4A964B66FFBFFCE46276A96475F1408728B3385DCA37C2BA46BE17E1023100C46B7F08D03409A8ECCFD7637765412C3C5EC050E0D39CF48F0F5015950342CB18D8434FF331BA4463C086297C37D07B");
+        let enc_resp = hex!(
+            "3082028430030201003082027B06092A864886F70D010702A082026C30820268020103310F300D060960864801650304020105003081C9060B2A864886F70D0109100104A081B90481B63081B302010106042A0304013031300D060960864801650304020105000420BA7816BF8F01CFEA414140DE5DAE2223B00361A396177A9CB410FF61F20015AD020104180F32303233303630373131323632365A300A020101800201F48101640101FF0208314CFCE4E0651827A048A4463044310B30090603550406130255533113301106035504080C0A536F6D652D5374617465310D300B060355040A0C04546573743111300F06035504030C0854657374205453413182018430820180020101305C3044310B30090603550406130255533113301106035504080C0A536F6D652D5374617465310D300B060355040A0C04546573743111300F06035504030C08546573742054534102146A0DCC59137C11D1C2B092042B4BC51C0D634D24300D06096086480165030402010500A08198301A06092A864886F70D010903310D060B2A864886F70D0109100104301C06092A864886F70D010905310F170D3233303630373131323632365A302B060B2A864886F70D010910020C311C301A3018301604142F36B1B52456F5AC3A1CA09794AE3D0D64AD38C2302F06092A864886F70D01090431220420BAF4CCF82E9B5B3956EADCC87346B407684F26D82B68D0E7DE0D31EA79AF648C300A06082A8648CE3D0403020467306502305A6E1C175B20A93FAB25D14CC5F5A2836D726D6D4A964B66FFBFFCE46276A96475F1408728B3385DCA37C2BA46BE17E1023100C46B7F08D03409A8ECCFD7637765412C3C5EC050E0D39CF48F0F5015950342CB18D8434FF331BA4463C086297C37D07B"
+        );
         let resp = TimeStampResp::from_der(&enc_resp).unwrap();
         let content = resp.time_stamp_token.unwrap().content;
         let sd = SignedData::from_der(&content.to_der().unwrap()).unwrap();