Reverted proposed constructor changes to X509_CA.

- Removed Certificate_Properties class used to wrap X509_CA parameters.
- Whitespace cleanup.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/cert/x509/x509_ca.cpp b/src/lib/cert/x509/x509_ca.cpp
index 02f77c8f6..147fdd6ad 100644
--- a/src/lib/cert/x509/x509_ca.cpp
+++ b/src/lib/cert/x509/x509_ca.cpp
@@ -1,7 +1,6 @@
 /*
 * X.509 Certificate Authority
 * (C) 1999-2010 Jack Lloyd
-*     2016 Matthias Gierlings
 *
 * Botan is released under the Simplified BSD License (see license.txt)
 */
@@ -79,10 +78,8 @@ X509_Certificate X509_CA::sign_request(const PKCS10_Request& req,
 
    return make_cert(m_signer, rng, m_ca_sig_algo,
                     req.raw_public_key(),
-                    Certificate_Properties(not_before,
-                                           not_after,
-                                           m_cert.subject_dn(),
-                                           req.subject_dn()),
+                    not_before, not_after,
+                    m_cert.subject_dn(), req.subject_dn(),
                     extensions);
    }
 
@@ -93,7 +90,10 @@ X509_Certificate X509_CA::make_cert(PK_Signer* signer,
                                     RandomNumberGenerator& rng,
                                     const AlgorithmIdentifier& sig_algo,
                                     const std::vector<byte>& pub_key,
-                                    const Certificate_Properties properties,
+                                    const X509_Time& not_before,
+                                    const X509_Time& not_after,
+                                    const X509_DN& issuer_dn,
+                                    const X509_DN& subject_dn,
                                     const Extensions& extensions)
    {
    const size_t X509_CERT_VERSION = 3;
@@ -112,14 +112,14 @@ X509_Certificate X509_CA::make_cert(PK_Signer* signer,
          .encode(serial_no)
 
          .encode(sig_algo)
-         .encode(properties.get_issuer_dn())
+         .encode(issuer_dn)
 
          .start_cons(SEQUENCE)
-            .encode(properties.get_not_before())
-            .encode(properties.get_not_after())
+            .encode(not_before)
+            .encode(not_after)
          .end_cons()
 
-         .encode(properties.get_subject_dn())
+         .encode(subject_dn)
          .raw_bytes(pub_key)
 
          .start_explicit(3)