fmt: Reorganizing includes

[cassiopeia.git] / src / simpleOpensslSigner.cpp

diff --git a/src/simpleOpensslSigner.cpp b/src/simpleOpensslSigner.cpp
index e38aeb1208c9986bd583b50b5ac41b5ec1c6bb83..931f22ef84d14bb73074ee2d33aa9ba146e14072 100644 (file)
--- a/src/simpleOpensslSigner.cpp
+++ b/src/simpleOpensslSigner.cpp
@@ -11,6 +11,8 @@
 
 #include "X509.h"
 
+extern std::vector<Profile> profiles;
+
 std::shared_ptr<int> SimpleOpensslSigner::lib_ref(
     new int( SSL_library_init() ),
     []( int* ref ) {
@@ -62,16 +64,27 @@ std::shared_ptr<EVP_PKEY> loadPkeyFromFile( std::string filename ) {
         } );
 }
 
-std::shared_ptr<X509> SimpleOpensslSigner::caCert = loadX509FromFile( "assured.crt" );
+SimpleOpensslSigner::SimpleOpensslSigner() {
+    caCert = loadX509FromFile( profiles[0].cert );
+    caKey = loadPkeyFromFile( profiles[0].key );
+}
 
-std::shared_ptr<EVP_PKEY> SimpleOpensslSigner::caKey = loadPkeyFromFile( "assured.key" );
+int serial = 10;
 
-void SimpleOpensslSigner::sign( std::shared_ptr<TBSCertificate> cert ) {
+std::shared_ptr<SignedCertificate> SimpleOpensslSigner::sign( std::shared_ptr<TBSCertificate> cert ) {
     if( !caKey ) {
         throw "CA-key not found";
     }
 
-    std::shared_ptr<X509Req> req = X509Req::parse( cert->csr_content );
+    std::shared_ptr<X509Req> req;
+
+    if( cert->csr_type == "SPKAC" ) {
+        req = X509Req::parseSPKAC( cert->csr_content );
+    } else if( cert->csr_type == "CSR" ) {
+        req = X509Req::parse( cert->csr_content );
+    } else {
+        throw "Error, unknown REQ rype " + ( cert->csr_type );
+    }
 
     int i = req->verify();
 
@@ -94,11 +107,11 @@ void SimpleOpensslSigner::sign( std::shared_ptr<TBSCertificate> cert ) {
 
     c.setIssuerNameFrom( caCert );
     c.setPubkeyFrom( req );
-    c.setSerialNumber( 4711 );
+    c.setSerialNumber( serial++ );
     c.setTimes( 0, 60 * 60 * 24 * 10 );
     c.setExtensions( caCert, cert->SANs );
 
-    std::string output = c.sign( caKey );
+    std::shared_ptr<SignedCertificate> output = c.sign( caKey );
 
-    std::cout << "Certificate:" << std::endl << output << std::endl;
+    return output;
 }