add getters & equality functionality s.t. one can extract digest+algo from a TsReq to confirm it matches the data it supposedly signs

Author: Jonas Maier

openssl-sys/src/handwritten/x509.rs

@@ -214,6 +214,8 @@ extern "C" {
     pub fn X509_ALGOR_free(x: *mut X509_ALGOR);
     pub fn X509_ALGOR_set_md(alg: *mut X509_ALGOR, md: *const EVP_MD);
 
+    pub fn X509_ALGOR_cmp(alg0: *const X509_ALGOR, alg1: *const X509_ALGOR) -> c_int;
+
     pub fn X509_REVOKED_new() -> *mut X509_REVOKED;
     pub fn X509_REVOKED_free(x: *mut X509_REVOKED);
 }

openssl-sys/src/ts.rs

@@ -1,6 +1,8 @@
 use libc::*;
 
-use crate::{ASN1_INTEGER, ASN1_OBJECT, BIO, EVP_MD, EVP_PKEY, X509, X509_ALGOR};
+use crate::{
+    ASN1_INTEGER, ASN1_OBJECT, ASN1_OCTET_STRING, BIO, EVP_MD, EVP_PKEY, X509, X509_ALGOR,
+};
 
 pub enum TS_MSG_IMPRINT {}
 pub enum TS_REQ {}
@@ -62,7 +64,9 @@ extern "C" {
     pub fn TS_MSG_IMPRINT_new() -> *mut TS_MSG_IMPRINT;
     pub fn TS_MSG_IMPRINT_free(a: *mut TS_MSG_IMPRINT);
     pub fn TS_MSG_IMPRINT_set_algo(a: *mut TS_MSG_IMPRINT, alg: *mut X509_ALGOR) -> c_int;
+    pub fn TS_MSG_IMPRINT_get_algo(a: *mut TS_MSG_IMPRINT) -> *mut X509_ALGOR;
     pub fn TS_MSG_IMPRINT_set_msg(a: *mut TS_MSG_IMPRINT, d: *mut c_uchar, length: c_int) -> c_int;
+    pub fn TS_MSG_IMPRINT_get_msg(a: *mut TS_MSG_IMPRINT) -> *mut ASN1_OCTET_STRING;
 
     pub fn TS_REQ_new() -> *mut TS_REQ;
     pub fn TS_REQ_free(a: *mut TS_REQ);

openssl/src/asn1.rs

@@ -651,6 +651,18 @@ impl Asn1OctetStringRef {
     }
 }
 
+impl PartialEq for Asn1OctetStringRef {
+    fn eq(&self, other: &Self) -> bool {
+        self.as_slice() == other.as_slice()
+    }
+}
+
+impl PartialEq for Asn1OctetString {
+    fn eq(&self, other: &Self) -> bool {
+        Asn1OctetStringRef::eq(self, other)
+    }
+}
+
 foreign_type_and_impl_send_sync! {
     type CType = ffi::ASN1_OBJECT;
     fn drop = ffi::ASN1_OBJECT_free;

openssl/src/ts.rs

@@ -11,7 +11,7 @@ use openssl_macros::corresponds;
 use std::convert::TryFrom;
 use std::ptr;
 
-use crate::asn1::{Asn1IntegerRef, Asn1ObjectRef};
+use crate::asn1::{Asn1IntegerRef, Asn1ObjectRef, Asn1OctetString};
 use crate::bio::MemBioSlice;
 use crate::error::ErrorStack;
 use crate::hash::{Hasher, MessageDigest};
@@ -31,6 +31,17 @@ foreign_type_and_impl_send_sync! {
     pub struct TsMsgImprintRef;
 }
 
+impl PartialEq for TsMsgImprintRef {
+    fn eq(&self, other: &Self) -> bool {
+        self.get_msg() == other.get_msg() && self.get_algo() == other.get_algo()
+    }
+}
+impl PartialEq for TsMsgImprint {
+    fn eq(&self, other: &Self) -> bool {
+        TsMsgImprintRef::eq(self, other)
+    }
+}
+
 impl TsMsgImprint {
     /// Creates a new message imprint.
     #[corresponds(TS_MSG_IMPRINT_new)]
@@ -91,6 +102,24 @@ impl TsMsgImprint {
     }
 }
 
+impl TsMsgImprintRef {
+    #[corresponds(TS_MSG_IMPRINT_get_msg)]
+    pub fn get_msg(&self) -> Option<Asn1OctetString> {
+        unsafe {
+            let octet = ffi::TS_MSG_IMPRINT_get_msg(self.as_ptr());
+            Asn1OctetString::from_ptr_opt(octet)
+        }
+    }
+
+    #[corresponds(TS_MSG_IMPRINT_get_algo)]
+    pub fn get_algo(&self) -> Option<X509Algorithm> {
+        unsafe {
+            let algo = ffi::TS_MSG_IMPRINT_get_algo(self.as_ptr());
+            X509Algorithm::from_ptr_opt(algo)
+        }
+    }
+}
+
 foreign_type_and_impl_send_sync! {
     type CType = ffi::TS_REQ;
     fn drop = ffi::TS_REQ_free;

openssl/src/x509/mod.rs

@@ -2340,13 +2340,28 @@ impl X509AlgorithmRef {
         }
     }
 
+    #[corresponds(X509_ALGOR_set_md)]
     pub fn set_md(&mut self, md: MessageDigest) {
         unsafe {
             ffi::X509_ALGOR_set_md(self.as_ptr(), md.as_ptr());
         }
     }
 }
 
+impl PartialEq for X509AlgorithmRef {
+    fn eq(&self, other: &Self) -> bool {
+        unsafe {
+            ffi::X509_ALGOR_cmp(self.as_ptr(), other.as_ptr()) == 0
+        }
+    }
+}
+
+impl PartialEq for X509Algorithm {
+    fn eq(&self, other: &Self) -> bool {
+        X509AlgorithmRef::eq(self, other)
+    }
+}
+
 foreign_type_and_impl_send_sync! {
     type CType = ffi::X509_OBJECT;
     fn drop = X509_OBJECT_free;