add: Add support for Subject Alternative Names (SANs)

[cassiopeia.git] / src / simpleOpensslSigner.cpp

diff --git a/src/simpleOpensslSigner.cpp b/src/simpleOpensslSigner.cpp
index 08471bc2a3f3ec3cb84cdfbea0319f15d950e3aa..e38aeb1208c9986bd583b50b5ac41b5ec1c6bb83 100644 (file)
--- a/src/simpleOpensslSigner.cpp
+++ b/src/simpleOpensslSigner.cpp
@@ -7,40 +7,98 @@
 #include <openssl/bio.h>
 #include <openssl/bn.h>
 #include <openssl/engine.h>
+#include <openssl/x509v3.h>
 
-void SimpleOpensslSigner::sign( std::shared_ptr<TBSCertificate> cert ) {
-    std::cout << cert->CN << std::endl;
-    BIO* in;
-    in = BIO_new_mem_buf( const_cast<char*>( cert->csr_content.c_str() ), -1 );
-    X509_REQ* req = PEM_read_bio_X509_REQ( in, NULL, NULL, NULL );
-
-    if( req == NULL ) {
-        std::cerr << "Error parsing CSR" << std::endl;
-        return;
+#include "X509.h"
+
+std::shared_ptr<int> SimpleOpensslSigner::lib_ref(
+    new int( SSL_library_init() ),
+    []( int* ref ) {
+        delete ref;
+
+        EVP_cleanup();
+        CRYPTO_cleanup_all_ex_data();
+    } );
+
+std::shared_ptr<X509> loadX509FromFile( std::string filename ) {
+    FILE* f = fopen( filename.c_str(), "r" );
+
+    if( !f ) {
+        return std::shared_ptr<X509>();
+    }
+
+    X509* key = PEM_read_X509( f, NULL, NULL, 0 );
+    fclose( f );
+
+    if( !key ) {
+        return std::shared_ptr<X509>();
+    }
+
+    return std::shared_ptr<X509>(
+        key,
+        []( X509 * ref ) {
+            X509_free( ref );
+        } );
+}
+
+std::shared_ptr<EVP_PKEY> loadPkeyFromFile( std::string filename ) {
+    FILE* f = fopen( filename.c_str(), "r" );
+
+    if( !f ) {
+        return std::shared_ptr<EVP_PKEY>();
     }
 
-    EVP_PKEY* pktmp = X509_REQ_get_pubkey( req );
+    EVP_PKEY* key = PEM_read_PrivateKey( f, NULL, NULL, 0 );
+    fclose( f );
 
-    if( pktmp == NULL ) {
-        std::cerr << "Error extracting pubkey" << std::endl;
-        return;
+    if( !key ) {
+        return std::shared_ptr<EVP_PKEY>();
     }
 
-    std::cout << req << ";" << pktmp << std::endl;
-    SSL_library_init();
-    int i = X509_REQ_verify( req, pktmp );
-    ERR_load_crypto_strings();
-    ERR_print_errors_fp( stderr );
-    std::cout << ERR_get_error() << std::endl;
+    return std::shared_ptr<EVP_PKEY>(
+        key,
+        []( EVP_PKEY * ref ) {
+            EVP_PKEY_free( ref );
+        } );
+}
+
+std::shared_ptr<X509> SimpleOpensslSigner::caCert = loadX509FromFile( "assured.crt" );
+
+std::shared_ptr<EVP_PKEY> SimpleOpensslSigner::caKey = loadPkeyFromFile( "assured.key" );
+
+void SimpleOpensslSigner::sign( std::shared_ptr<TBSCertificate> cert ) {
+    if( !caKey ) {
+        throw "CA-key not found";
+    }
+
+    std::shared_ptr<X509Req> req = X509Req::parse( cert->csr_content );
+
+    int i = req->verify();
 
     if( i < 0 ) {
-        std::cerr << "Signature problems ... " << i << std::endl;
-        return;
+        throw "Signature problems ... ";
     } else if( i == 0 ) {
-        std::cerr << "Signature did not match" << std::endl;
-        return;
+        throw "Signature did not match";
     } else {
         std::cerr << "Signature ok" << std::endl;
     }
 
+    // Construct the Certificate
+    X509Cert c = X509Cert();
+    std::shared_ptr<X509> retsh = std::shared_ptr<X509>( X509_new(), X509_free );
+    X509* ret = retsh.get();
+
+    if( !ret ) {
+        throw "Creating X509 failed.";
+    }
+
+    c.setIssuerNameFrom( caCert );
+    c.setPubkeyFrom( req );
+    c.setSerialNumber( 4711 );
+    c.setTimes( 0, 60 * 60 * 24 * 10 );
+    c.setExtensions( caCert, cert->SANs );
+
+    std::string output = c.sign( caKey );
+
+    std::cout << "Certificate:" << std::endl << output << std::endl;
 }