X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fcrypto%2FsimpleOpensslSigner.cpp;h=d5371ba26301497f853497f7e4c9aa1e05dc9167;hb=da9f337a893bd317460118f89efa83a3427f797f;hp=f0d415eb03de11d858106c3ec690e6f174eb9404;hpb=8071fe6ec700972d6ae9e4717ee07f4250c345c8;p=cassiopeia.git

diff --git a/src/crypto/simpleOpensslSigner.cpp b/src/crypto/simpleOpensslSigner.cpp
index f0d415e..d5371ba 100644
--- a/src/crypto/simpleOpensslSigner.cpp
+++ b/src/crypto/simpleOpensslSigner.cpp
@@ -2,6 +2,7 @@
 
 #include <sstream>
 #include <unordered_map>
+#include <exception>
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
@@ -30,23 +31,23 @@ std::pair<std::shared_ptr<BIGNUM>, std::string> SimpleOpensslSigner::nextSerial(
     uint16_t profile = prof.id;
     std::string res = readFile( ca->path + "/serial" );
 
-    BIGNUM* bn = 0;
+    BIGNUM *bn = 0;
 
     if( res == "" ) {
         bn = BN_new();
 
-        if( !bn || !BN_hex2bn( &bn, "1" )) {
-            throw "Initing serial failed";
+        if( !bn || !BN_hex2bn( &bn, "1" ) ) {
+            throw std::runtime_error( "Initing serial failed" );
         }
     } else {
         if( !BN_hex2bn( &bn, res.c_str() ) ) {
-            throw "Parsing serial failed.";
+            throw std::runtime_error( "Parsing serial failed." );
         }
     }
 
     std::shared_ptr<BIGNUM> serial = std::shared_ptr<BIGNUM>( bn, BN_free );
 
-    std::shared_ptr<unsigned char> data = std::shared_ptr<unsigned char>( ( unsigned char* ) malloc( BN_num_bytes( serial.get() ) + 20 ), free );
+    std::shared_ptr<unsigned char> data = std::shared_ptr<unsigned char>( ( unsigned char * ) malloc( BN_num_bytes( serial.get() ) + 20 ), free );
     int len = BN_bn2bin( serial.get(), data.get() );
 
     data.get()[len] = 0x0;
@@ -56,7 +57,7 @@ std::pair<std::shared_ptr<BIGNUM>, std::string> SimpleOpensslSigner::nextSerial(
     data.get()[len + 3] = profile & 0xFF; // profile id
 
     if( !RAND_bytes( data.get() + len + 4, 16 ) || !BN_add_word( serial.get(), 1 ) ) {
-        throw "Big number math failed while fetching random data for serial number.";
+        throw std::runtime_error( "Big number math failed while fetching random data for serial number." );
     }
 
     std::shared_ptr<char> serStr = std::shared_ptr<char>(
@@ -67,12 +68,12 @@ std::pair<std::shared_ptr<BIGNUM>, std::string> SimpleOpensslSigner::nextSerial(
 
     writeFile( ca->path + "/serial", serStr.get() );
 
-    return std::pair<std::shared_ptr<BIGNUM>, std::string>( std::shared_ptr<BIGNUM>( BN_bin2bn( data.get(), len + 4 + 16 , 0 ), BN_free ), std::string( serStr.get() ) );
+    return std::pair<std::shared_ptr<BIGNUM>, std::string>( std::shared_ptr<BIGNUM>( BN_bin2bn( data.get(), len + 4 + 16, 0 ), BN_free ), std::string( serStr.get() ) );
 }
 
 std::shared_ptr<SignedCertificate> SimpleOpensslSigner::sign( std::shared_ptr<TBSCertificate> cert ) {
     std::stringstream signlog;
-    logger::logger_set log_set_sign({logger::log_target(signlog, logger::level::debug)}, logger::auto_register::on);
+    logger::logger_set log_set_sign( {logger::log_target( signlog, logger::level::debug )}, logger::auto_register::on );
 
     logger::note( "FINE: Profile name is: ", cert->profile );
 
@@ -83,7 +84,11 @@ std::shared_ptr<SignedCertificate> SimpleOpensslSigner::sign( std::shared_ptr<TB
 
     if( !ca ) {
         logger::error( "ERROR: Signing CA specified in profile could not be loaded." );
-        throw "CA-key not found";
+        throw std::runtime_error( "CA-key not found" );
+    }
+
+    if( !ca->caKey ) {
+        throw std::runtime_error( "Cannot sign certificate with CA " + ca->name + " because it has no private key." );
     }
 
     logger::note( "FINE: Key for Signing CA is correctly loaded." );
@@ -102,15 +107,15 @@ std::shared_ptr<SignedCertificate> SimpleOpensslSigner::sign( std::shared_ptr<TB
         req = X509Req::parseCSR( cert->csr_content );
     } else {
         logger::errorf( "ERROR: Unknown type (\"%s\") of certification in request.", cert->csr_type );
-        throw "Error, unknown REQ rype " + ( cert->csr_type ); //! \fixme: Pointer instead of string, please use proper exception classes
+        throw std::runtime_error( "Error, unknown REQ rype " + cert->csr_type ); //! \fixme: Pointer instead of string, please use proper exception classe)s
     }
 
     int i = req->verify();
 
     if( i < 0 ) {
-        throw "Request contains a Signature with problems ... ";
+        throw std::runtime_error( "Request contains a Signature with problems ... " );
     } else if( i == 0 ) {
-        throw "Request contains a Signature that does not match ...";
+        throw std::runtime_error( "Request contains a Signature that does not match ..." );
     } else {
         logger::note( "FINE: Request contains valid self-signature." );
     }
@@ -122,10 +127,12 @@ std::shared_ptr<SignedCertificate> SimpleOpensslSigner::sign( std::shared_ptr<TB
 
     for( std::shared_ptr<AVA> a : cert->AVAs ) {
         logger::notef( "INFO: Trying to add RDN: %s: %s", a->name, a->value );
+
         if( a->value.empty() ) {
-            logger::notef( "INFO: Removing empty RDN: %s", a->name);
+            logger::notef( "INFO: Removing empty RDN: %s", a->name );
             continue;
         }
+
         if( a->name == "CN" ) {
             c.addRDN( NID_commonName, a->value );
         } else if( a->name == "EMAIL" ) {
@@ -142,7 +149,7 @@ std::shared_ptr<SignedCertificate> SimpleOpensslSigner::sign( std::shared_ptr<TB
             c.addRDN( NID_organizationalUnitName, a->value );
         } else {
             logger::error( "ERROR: Trying to add illegal RDN/AVA type: ", a->name );
-            throw "Unhandled/Illegal AVA type";
+            throw std::runtime_error( "Unhandled/Illegal AVA type" );
         }
     }
 
@@ -210,17 +217,17 @@ std::shared_ptr<SignedCertificate> SimpleOpensslSigner::sign( std::shared_ptr<TB
         c.setTimes( from, to );
         logger::note( "FINE: Setting validity period successful:" );
         {
-            struct tm* timeobj;
+            struct tm *timeobj;
             std::vector<char> timebuf;
 
             timeobj = gmtime( &from );
             timebuf.resize( 128 );
-            timebuf.resize( std::strftime( const_cast<char*>( timebuf.data() ), timebuf.size(), "%F %T %Z", timeobj ) );
+            timebuf.resize( std::strftime( const_cast<char *>( timebuf.data() ), timebuf.size(), "%F %T %Z", timeobj ) );
             logger::note( "FINE: - Valid not before: ", std::string( timebuf.cbegin(), timebuf.cend() ) );
 
             timeobj = gmtime( &to );
             timebuf.resize( 128 );
-            timebuf.resize( std::strftime( const_cast<char*>( timebuf.data() ), timebuf.size(), "%F %T %Z", timeobj ) );
+            timebuf.resize( std::strftime( const_cast<char *>( timebuf.data() ), timebuf.size(), "%F %T %Z", timeobj ) );
             logger::note( "FINE: - Valid not after:  ", std::string( timebuf.cbegin(), timebuf.cend() ) );
         }
     }
@@ -244,7 +251,7 @@ std::shared_ptr<SignedCertificate> SimpleOpensslSigner::sign( std::shared_ptr<TB
 
         if( fn.empty() ) {
             logger::error( "ERROR: failed to get filename for storage of signed certificate." );
-            throw "Storage location could not be determined";
+            throw std::runtime_error( "Storage location could not be determined" );
         }
 
         logger::note( "FINE: Certificate signed successfully." );
@@ -264,6 +271,7 @@ std::pair<std::shared_ptr<CRL>, std::string> SimpleOpensslSigner::revoke( std::s
     std::string date = "";
 
     logger::note( "adding serials" );
+
     for( std::string serial : serials ) {
         date = crl->revoke( serial, "" );
     }