cmpv2,cms,x509-ocsp: fixes for x509-cert API changes

Author: tarcieri

cmpv2/tests/cert_req.rs

@@ -127,7 +127,7 @@ fn cr_rsp_message_test() {
     let server_cert = Certificate::from_der(enc_server_cert).unwrap();
     let header = &message.header;
     match &header.sender {
-        GeneralName::DirectoryName(name) => assert_eq!(server_cert.tbs_certificate.subject, *name),
+        GeneralName::DirectoryName(name) => assert_eq!(server_cert.tbs_certificate.subject(), name),
         _ => panic!(),
     }
     match &header.recipient {

cmpv2/tests/init_req.rs

@@ -234,7 +234,9 @@ fn ir_rsp_message_test() {
     let server_cert = Certificate::from_der(enc_server_cert).unwrap();
     let header = &message.header;
     match &header.sender {
-        GeneralName::DirectoryName(name) => assert_eq!(server_cert.tbs_certificate.subject, *name),
+        GeneralName::DirectoryName(name) => {
+            assert_eq!(server_cert.tbs_certificate.subject(), name)
+        }
         _ => panic!(),
     }
     match &header.recipient {

cmpv2/tests/p10cr_req.rs

@@ -58,7 +58,7 @@ fn p10cr_req_message_test() {
     match &message.body {
         PkiBody::P10cr(p10crs) => {
             assert_eq!(
-                ee_cert.tbs_certificate.subject.to_string(),
+                ee_cert.tbs_certificate.subject().to_string(),
                 p10crs.info.subject.to_string()
             );
         }

cms/tests/enveloped_data.rs

@@ -49,8 +49,8 @@ fn reencode_enveloped_data_ktri_test() {
                 );
                 match &ktri.rid {
                     RecipientIdentifier::IssuerAndSerialNumber(iasn) => {
-                        assert_eq!(cert.tbs_certificate.issuer, iasn.issuer);
-                        assert_eq!(cert.tbs_certificate.serial_number, iasn.serial_number);
+                        assert_eq!(cert.tbs_certificate.issuer(), &iasn.issuer);
+                        assert_eq!(cert.tbs_certificate.serial_number(), &iasn.serial_number);
                     }
                     _ => panic!(),
                 }
@@ -146,8 +146,8 @@ fn reencode_enveloped_data_kari_test() {
                 for rk in &kari.recipient_enc_keys {
                     match &rk.rid {
                         KeyAgreeRecipientIdentifier::IssuerAndSerialNumber(iasn) => {
-                            assert_eq!(cert.tbs_certificate.issuer, iasn.issuer);
-                            assert_eq!(cert.tbs_certificate.serial_number, iasn.serial_number);
+                            assert_eq!(cert.tbs_certificate.issuer(), &iasn.issuer);
+                            assert_eq!(cert.tbs_certificate.serial_number(), &iasn.serial_number);
                         }
                         _ => panic!(),
                     }
@@ -375,8 +375,11 @@ fn reencode_enveloped_data_multi_test() {
                 );
                 match &ktri.rid {
                     RecipientIdentifier::IssuerAndSerialNumber(iasn) => {
-                        assert_eq!(rsa_cert.tbs_certificate.issuer, iasn.issuer);
-                        assert_eq!(rsa_cert.tbs_certificate.serial_number, iasn.serial_number);
+                        assert_eq!(rsa_cert.tbs_certificate.issuer(), &iasn.issuer);
+                        assert_eq!(
+                            rsa_cert.tbs_certificate.serial_number(),
+                            &iasn.serial_number
+                        );
                     }
                     _ => panic!(),
                 }
@@ -415,8 +418,11 @@ fn reencode_enveloped_data_multi_test() {
                 for rk in &kari.recipient_enc_keys {
                     match &rk.rid {
                         KeyAgreeRecipientIdentifier::IssuerAndSerialNumber(iasn) => {
-                            assert_eq!(ec_cert.tbs_certificate.issuer, iasn.issuer);
-                            assert_eq!(ec_cert.tbs_certificate.serial_number, iasn.serial_number);
+                            assert_eq!(ec_cert.tbs_certificate.issuer(), &iasn.issuer);
+                            assert_eq!(
+                                ec_cert.tbs_certificate.serial_number(),
+                                &iasn.serial_number
+                            );
                         }
                         _ => panic!(),
                     }

x509-ocsp/src/builder/response.rs

@@ -40,7 +40,7 @@ use x509_cert::{
 /// let req = OcspRequest::from_der(OCSP_REQ_DER).unwrap();
 /// let ca = Certificate::from_der(CA_DER).unwrap();
 ///
-/// let mut builder = OcspResponseBuilder::new(ca.tbs_certificate.subject.clone())
+/// let mut builder = OcspResponseBuilder::new(ca.tbs_certificate.subject().clone())
 ///     .with_single_response(
 ///         SingleResponse::new(
 ///             req.tbs_request.request_list[0].req_cert.clone(),