From b476c2e9a25a43a291e7531e3b1c300c1c9a8732 Mon Sep 17 00:00:00 2001
From: Arthur Gautier <baloo@superbaloo.net>
Date: Tue, 1 Aug 2023 16:04:44 +0000
Subject: [PATCH 1/2] x509-tsp: enable CI

This enables CI on x509-tsp. It also fixes tests that broke with #1130

Fixes #1176

Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
---
 .github/workflows/x509-tsp.yml | 46 ++++++++++++++++++++++++++++++++++
 x509-tsp/src/lib.rs            |  5 +---
 2 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/x509-tsp.yml

diff --git a/.github/workflows/x509-tsp.yml b/.github/workflows/x509-tsp.yml
new file mode 100644
index 000000000..d7a923b1b
--- /dev/null
+++ b/.github/workflows/x509-tsp.yml
@@ -0,0 +1,46 @@
+name: x509-tsp
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/x509-tsp.yml"
+      - "const-oid/**"
+      - "cmpv2/**"
+      - "cms/**"
+      - "der/**"
+      - "spki/**"
+      - "x509-cert/**"
+      - "x509-tsp/**"
+      - "Cargo.*"
+  push:
+    branches: master
+
+defaults:
+  run:
+    working-directory: x509-tsp
+
+env:
+  CARGO_INCREMENTAL: 0
+  RUSTFLAGS: "-Dwarnings"
+
+jobs:
+  minimal-versions:
+    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
+    with:
+        working-directory: ${{ github.workflow }}
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - 1.65.0 # MSRV
+          - stable
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
+      - uses: RustCrypto/actions/cargo-hack-install@master
+      - run: cargo hack test --feature-powerset
diff --git a/x509-tsp/src/lib.rs b/x509-tsp/src/lib.rs
index dfb629141..1f9bdac87 100644
--- a/x509-tsp/src/lib.rs
+++ b/x509-tsp/src/lib.rs
@@ -214,10 +214,7 @@ mod tests {
             GeneralName::DirectoryName(n) => n,
             _ => panic!(),
         };
-        assert_eq!(
-            dn.to_string(),
-            "C=US,STATEORPROVINCENAME=Some-State,O=Test,CN=Test TSA"
-        );
+        assert_eq!(dn.to_string(), "CN=Test TSA,O=Test,ST=Some-State,C=US");
         assert_eq!(
             tst.message_imprint.hashed_message.as_bytes(),
             hex!("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")

From d9caff55c0151437815a1d64620291d3307c3f71 Mon Sep 17 00:00:00 2001
From: Arthur Gautier <baloo@superbaloo.net>
Date: Tue, 1 Aug 2023 16:26:37 +0000
Subject: [PATCH 2/2] x509-tsp: use a direct dependency on x509-cert

Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
---
 Cargo.lock          |  1 +
 x509-tsp/Cargo.toml |  1 +
 x509-tsp/src/lib.rs | 12 +++++-------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fdb9733f2..3daf9fa43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2024,6 +2024,7 @@ dependencies = [
  "cms",
  "der",
  "hex-literal",
+ "x509-cert",
 ]
 
 [[package]]
diff --git a/x509-tsp/Cargo.toml b/x509-tsp/Cargo.toml
index 936958240..a30fa1c43 100644
--- a/x509-tsp/Cargo.toml
+++ b/x509-tsp/Cargo.toml
@@ -17,6 +17,7 @@ rust-version = "1.65"
 der = { version = "0.7.6", features = ["alloc", "derive", "oid", "pem"] }
 cms = { version = "0.2.1", features = ["alloc", "std"] }
 cmpv2 = { version = "0.2", features = ["alloc", "std"] }
+x509-cert = { version = "0.2.4", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.4.1"
diff --git a/x509-tsp/src/lib.rs b/x509-tsp/src/lib.rs
index 1f9bdac87..d849c345a 100644
--- a/x509-tsp/src/lib.rs
+++ b/x509-tsp/src/lib.rs
@@ -1,16 +1,14 @@
 use cmpv2::status::PkiStatusInfo;
-use cms::{
-    cert::x509::{
-        ext::{pkix::name::GeneralName, Extensions},
-        spki::AlgorithmIdentifier,
-    },
-    content_info::ContentInfo,
-};
+use cms::content_info::ContentInfo;
 use der::{
     asn1::{GeneralizedTime, Int, OctetString},
     oid::ObjectIdentifier,
     Any, Enumerated, Sequence,
 };
+use x509_cert::{
+    ext::{pkix::name::GeneralName, Extensions},
+    spki::AlgorithmIdentifier,
+};
 
 #[derive(Clone, Copy, Debug, Enumerated, Eq, PartialEq, PartialOrd, Ord)]
 #[asn1(type = "INTEGER")]