From c9a252dc5c47e5d72ff67eae858f11bacfc3474e Mon Sep 17 00:00:00 2001
From: Alexis <alexis.challande@trailofbits.com>
Date: Thu, 31 Oct 2024 15:04:17 +0100
Subject: [PATCH 1/4] Add an `__eq__` method

Signed-off-by: Alexis <alexis.challande@trailofbits.com>
---
 CHANGELOG.md    |  4 ++++
 rust/src/lib.rs | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6e4835..c64460e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Magic method (`__eq__` and `__repr__`) has been added for TimestampResponse 
+  and TimestampRequest ([#48](https://github.com/trailofbits/rfc3161-client/pull/48))
 
 ## [0.0.2] - 2024-10-30
 
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 487fd8d..e86ad3e 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -103,6 +103,12 @@ impl TimeStampReq {
         hasher.finish()
     }
 
+    fn __eq__(&self, py: pyo3::Python<'_>, other: pyo3::PyRef<'_, Self>) -> pyo3::PyResult<bool> {
+        let other_bytes = other.as_bytes(py)?;
+        let self_bytes = self.as_bytes(py)?;
+        Ok(other_bytes.eq(&self_bytes.as_bytes()))
+    }
+
     fn __repr__(&self, py: pyo3::Python<'_>) -> pyo3::PyResult<String> {
         let version = self.version()?;
         let nonce_repr = match self.nonce(py)? {
@@ -293,6 +299,12 @@ impl TimeStampResp {
         hasher.finish()
     }
 
+    fn __eq__(&self, other: pyo3::PyRef<'_, Self>) -> pyo3::PyResult<bool> {
+        let other_bytes = asn1::write_single(&other.raw.borrow_dependent()).unwrap();
+        let self_bytes = asn1::write_single(&self.raw.borrow_dependent()).unwrap();
+        Ok(other_bytes.eq(&self_bytes))
+    }
+
     fn __repr__(&self) -> pyo3::PyResult<String> {
         let status = self.status()?;
         Ok(format!("<TimestampResponse(status={status}, ...)>"))

From 636ab8e0a0b774b805e1845c12eac0bd2d3235ed Mon Sep 17 00:00:00 2001
From: Alexis <alexis.challande@trailofbits.com>
Date: Tue, 5 Nov 2024 12:27:16 +0100
Subject: [PATCH 2/4] Add missing tests

Signed-off-by: Alexis <alexis.challande@trailofbits.com>
---
 test/fixtures/other_request.der  | Bin 0 -> 102 bytes
 test/fixtures/other_response.tsr | Bin 0 -> 1232 bytes
 test/test_tsp.py                 |  55 +++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 test/fixtures/other_request.der
 create mode 100644 test/fixtures/other_response.tsr
 create mode 100644 test/test_tsp.py

diff --git a/test/fixtures/other_request.der b/test/fixtures/other_request.der
new file mode 100644
index 0000000000000000000000000000000000000000..fae125bacae2c976961a637eabe405c0090389a6
GIT binary patch
literal 102
zcmV-s0Ga<VWC8&JFi|iK1_@w>NC9O71OfvE00cmrandBcV)J-imegv~>OFHYoBP6v
z4654V-}faMXFR7PBg5I7rNJG1ddzMVxW(EGMq@`@E?hd^^lx*#-oQfw2>`KlaMGLp
I5+(rw|D$UvrvLx|

literal 0
HcmV?d00001

diff --git a/test/fixtures/other_response.tsr b/test/fixtures/other_response.tsr
new file mode 100644
index 0000000000000000000000000000000000000000..e66f8533a100f341b43ee037775ae656f5f67eba
GIT binary patch
literal 1232
zcmXqLVmV{L%*4oG(8O|>jZ>@5qwPB{BRkWACYCKgp$$xo%!a%M+-#f)Z61uN%q&cd
z28~bIxS{Ge1sGWtG+t$CykyXLo{5o>jZ>SAk%h5&zX6j$paCyJ7c(mZi^J@~ODcPl
zK3Bv}yOMSJm2I)%?B9nvc~;$ebpN}mWV+3AW#z*+XD>Y{TT^u=Ph`i@TRd*b?lF2X
zR`<T-7w@@uz?n&uq4T`jQJMU{<l8JRlb=Z}Zn?(vkxPQ#$iT?N(7@Qx(Ae0}#3Tyj
zA4VolhI;~w{+1n5DPLf+#K^$Fkk5dJjX9KsOPDn$KRGeSP|iRG#Ag;34M{C7Q3wfk
zR0zq;1u_$J3o`T47c?<mFlb^t1H?rOfF?3AiRk(I_jE^gJXxXqvVG-Eq1q!JiMj?{
zY#hMQIA_bk%tV|eo_QsyMY*XdnTaK-26E!OP`4Wxnwc0yiSq*e0P>1~p(T(@oQcTJ
zHi$G3W@87th=~#EG-gJ2W+w)gXvShAha#Sxv%{0au1{%g(l9=??QHUui3h*cDu22@
zDPgr$-}}g4f0Y-SOLf??UX-69B)2g_zV3a*ljeD^Hq2^ToMn(<zy}O7S$;;w|13Zc
zvo{#Xg7|zaVk{z6e;!Ud^}y<ijm{fEwu8M_ep;0{8pwmBm02VV#2Q32d0#Zht6tnE
ztGxW$lnq}ZFYkC8Xdnhspb9dN2NaaR^ux-^&dh-vtjrz^2ChsB98nkVH8sm;|J6;}
zdd8ST>1F@oxn=XN%d1!w-&ixzj*Ur?;Z4=!q(es@R@~j_U}eRvVZEbL*;0CAphN)Y
zDS>ds1<MSZ81Dh&^A<3D7<dpDw#c!CBLyJm4q&QLGmwI3Bu-%NLCGz^GzZIMoUDfY
z@Ysi@Tz!Nri=h&W!nEt<t;{#lJLfHJu0HkTn*FS&n{yT}_OMJYK6zYy&opa;#vMq;
zGwB;Pt}tj^YS6gIpm9D%{`>W8a=6%yhPbp6hse&{`?GGk?4S3z<cjlxZAA<F1kxlW
z^$M!Xj32M^d3$4V1zXDepipnGbM;HN`W*~h&+f3~uYr#N(K(5TU_;6{EFK1K!021o
zR9N^cRo8MquZm61*Ycw`U-+p-i0$8@_-n0Yf<WE{ppq-8fj^ZmJXV|WU{%hJ$L(i-
Ur^|%3wg=nI2`Ufdnzg|L07?Xte*gdg

literal 0
HcmV?d00001

diff --git a/test/test_tsp.py b/test/test_tsp.py
new file mode 100644
index 0000000..c03fd31
--- /dev/null
+++ b/test/test_tsp.py
@@ -0,0 +1,55 @@
+from datetime import datetime, timezone
+from pathlib import Path
+
+from rfc3161_client import TimeStampRequest, decode_timestamp_response
+from rfc3161_client._rust import parse_timestamp_request
+
+_HERE = Path(__file__).parent.resolve()
+_FIXTURE = _HERE / "fixtures"
+
+
+class TestTimestampResponse:
+    def test_parsing_good(self):
+        timestamp_response = decode_timestamp_response((_FIXTURE / "response.tsr").read_bytes())
+        assert timestamp_response.status == 0
+
+        tst_info = timestamp_response.tst_info
+        assert tst_info.name.value.rfc4514_string() == "CN=Test TSA Timestamping,O=local"
+        assert tst_info.nonce == 3937359519792308179
+        assert not tst_info.ordering
+        assert tst_info.policy.dotted_string == "1.3.6.1.4.1.57264.2"
+        assert tst_info.serial_number == 693290210947147715387173185458430793885588677084
+        assert tst_info.version == 1
+        assert datetime(2024, 10, 8, 15, 40, 32, tzinfo=timezone.utc) == tst_info.gen_time
+        assert tst_info.message_imprint.message.hex().startswith("9b71d224bd62f3785d96d")
+
+        assert tst_info.accuracy.seconds == 1
+        assert tst_info.accuracy.millis is None
+        assert tst_info.accuracy.micros is None
+
+    def test_equality(self):
+        timestamp_response = decode_timestamp_response((_FIXTURE / "response.tsr").read_bytes())
+        other_response = decode_timestamp_response((_FIXTURE / "other_response.tsr").read_bytes())
+
+        assert timestamp_response != other_response
+        assert decode_timestamp_response(
+            (_FIXTURE / "response.tsr").read_bytes()
+        ) == decode_timestamp_response((_FIXTURE / "response.tsr").read_bytes())
+
+
+class TestTimestampRequest:
+    def test_parsing_good(self):
+        timestamp_request: TimeStampRequest = parse_timestamp_request(
+            (_FIXTURE / "request.der").read_bytes()
+        )
+        assert timestamp_request.version == 1
+        assert timestamp_request.cert_req
+        assert timestamp_request.nonce == 3937359519792308179
+        assert timestamp_request.policy is None
+        assert timestamp_request.message_imprint.message.hex().startswith("9b71d224bd62f3785d96d")
+
+    def test_equality(self):
+        timestamp_response = parse_timestamp_request((_FIXTURE / "request.der").read_bytes())
+        other_response = parse_timestamp_request((_FIXTURE / "other_request.der").read_bytes())
+
+        assert timestamp_response != other_response

From 3984f731fb6d791fb62cc58bf38f20af81f989bf Mon Sep 17 00:00:00 2001
From: Alexis <alexis.challande@trailofbits.com>
Date: Tue, 5 Nov 2024 12:27:28 +0100
Subject: [PATCH 3/4] Fix type hint

Signed-off-by: Alexis <alexis.challande@trailofbits.com>
---
 src/rfc3161_client/tsp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rfc3161_client/tsp.py b/src/rfc3161_client/tsp.py
index 70a7f26..8e9de89 100644
--- a/src/rfc3161_client/tsp.py
+++ b/src/rfc3161_client/tsp.py
@@ -166,7 +166,7 @@ def nonce(self) -> bytes:
 
     @property
     @abc.abstractmethod
-    def name(self) -> cryptography.x509.Name:
+    def name(self) -> cryptography.x509.GeneralName:
         """Returns the name."""
 
 

From 1e4ce3c0ec7faef5f1fa125cff3de69cf700ef9f Mon Sep 17 00:00:00 2001
From: Alexis <alexis.challande@trailofbits.com>
Date: Tue, 5 Nov 2024 12:29:10 +0100
Subject: [PATCH 4/4] Fix name

Signed-off-by: Alexis <alexis.challande@trailofbits.com>
---
 test/test_tsp.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test_tsp.py b/test/test_tsp.py
index c03fd31..e71dbcf 100644
--- a/test/test_tsp.py
+++ b/test/test_tsp.py
@@ -49,7 +49,7 @@ def test_parsing_good(self):
         assert timestamp_request.message_imprint.message.hex().startswith("9b71d224bd62f3785d96d")
 
     def test_equality(self):
-        timestamp_response = parse_timestamp_request((_FIXTURE / "request.der").read_bytes())
-        other_response = parse_timestamp_request((_FIXTURE / "other_request.der").read_bytes())
+        timestamp_request = parse_timestamp_request((_FIXTURE / "request.der").read_bytes())
+        other_request = parse_timestamp_request((_FIXTURE / "other_request.der").read_bytes())
 
-        assert timestamp_response != other_response
+        assert timestamp_request != other_request