From: Benny Baumann <BenBE@geshi.org>
Date: Sat, 18 Jul 2015 18:40:24 +0000 (+0200)
Subject: fmt: Whitespace, indentation, generic source formatting
X-Git-Url: http://code.wpia.club/?a=commitdiff_plain;h=3d3967b16610579e977b5d8685f3eedb10cbc23a;p=cassiopeia.git

fmt: Whitespace, indentation, generic source formatting
---

diff --git a/src/apps/client.cpp b/src/apps/client.cpp
index d7cda51..1c1e188 100644
--- a/src/apps/client.cpp
+++ b/src/apps/client.cpp
@@ -93,7 +93,7 @@ int main( int argc, const char* argv[] ) {
             // todo set good log TODO FIXME
             sign->setLog( std::shared_ptr<std::ostream>(
                 &std::cout,
-                []( std::ostream * o ) {
+                []( std::ostream* o ) {
                     ( void ) o;
                 } ) );
             checkCRLs( sign );
diff --git a/src/apps/signer.cpp b/src/apps/signer.cpp
index 3468eb2..f7f61d8 100644
--- a/src/apps/signer.cpp
+++ b/src/apps/signer.cpp
@@ -36,7 +36,7 @@ int main( int argc, const char* argv[] ) try {
 #endif
 
     if( parseConfig( path ) != 0 ) {
-        logger::fatal("Could not parse configuration file.");
+        logger::fatal( "Could not parse configuration file." );
         return -1;
     }
 
diff --git a/src/config.cpp b/src/config.cpp
index 9dfb112..495231c 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -130,7 +130,6 @@ int parseProfiles() {
 }
 
 int parseConfig( std::string path ) {
-
     auto masterConf = parseConf( path );
 
     keyDir = masterConf->at( "key.directory" );
diff --git a/src/crypto/X509.cpp b/src/crypto/X509.cpp
index acc9dec..5eed484 100644
--- a/src/crypto/X509.cpp
+++ b/src/crypto/X509.cpp
@@ -268,8 +268,8 @@ std::shared_ptr<SignedCertificate> X509Cert::sign( std::shared_ptr<EVP_PKEY> caK
 
     std::shared_ptr<char> serStr(
         BN_bn2hex( ser.get() ),
-        []( char *p ) {
-            OPENSSL_free(p);
+        []( char* p ) {
+            OPENSSL_free( p );
         } ); // OPENSSL_free is a macro...
     res->serial = serStr ? std::string( serStr.get() ) : "";
 
diff --git a/src/crypto/simpleOpensslSigner.cpp b/src/crypto/simpleOpensslSigner.cpp
index 55b43ea..7f75142 100644
--- a/src/crypto/simpleOpensslSigner.cpp
+++ b/src/crypto/simpleOpensslSigner.cpp
@@ -250,7 +250,6 @@ std::shared_ptr<SignedCertificate> SimpleOpensslSigner::sign( std::shared_ptr<TB
         output->log = signlog.str();
         return output;
     }
-
 }
 
 std::pair<std::shared_ptr<CRL>, std::string> SimpleOpensslSigner::revoke( std::shared_ptr<CAConfig> ca, std::vector<std::string> serials ) {
diff --git a/src/crypto/sslUtil.cpp b/src/crypto/sslUtil.cpp
index 3b93b17..d4f55da 100644
--- a/src/crypto/sslUtil.cpp
+++ b/src/crypto/sslUtil.cpp
@@ -33,17 +33,19 @@ std::shared_ptr<X509> loadX509FromFile( const std::string& filename ) {
 
     return std::shared_ptr<X509>(
         key,
-        []( X509 * ref ) {
+        []( X509* ref ) {
             X509_free( ref );
         } );
 }
 
 std::shared_ptr<EVP_PKEY> loadPkeyFromFile( const std::string& filename ) {
-    std::shared_ptr<FILE> f( fopen( filename.c_str(), "r" ), []( FILE * ptr ) {
-        if( ptr ) {
-            fclose( ptr );
-        }
-    } );
+    std::shared_ptr<FILE> f(
+        fopen( filename.c_str(), "r" ),
+        []( FILE* ptr ) {
+            if( ptr ) {
+                fclose( ptr );
+            }
+        } );
 
     if( !f ) {
         return std::shared_ptr<EVP_PKEY>();
@@ -57,7 +59,7 @@ std::shared_ptr<EVP_PKEY> loadPkeyFromFile( const std::string& filename ) {
 
     return std::shared_ptr<EVP_PKEY>(
         key,
-        []( EVP_PKEY * ref ) {
+        []( EVP_PKEY* ref ) {
             EVP_PKEY_free( ref );
         } );
 }
@@ -66,7 +68,9 @@ int gencb( int a, int b, BN_GENCB* g ) {
     ( void ) a;
     ( void ) b;
     ( void ) g;
+
     std::cout << ( a == 0 ? "." : "+" ) << std::flush;
+
     return 1;
 }
 
@@ -86,9 +90,11 @@ static int verify_callback( int preverify_ok, X509_STORE_CTX* ctx ) {
 static std::shared_ptr<DH> dh_param;
 
 std::shared_ptr<SSL_CTX> generateSSLContext( bool server ) {
-    std::shared_ptr<SSL_CTX> ctx = std::shared_ptr<SSL_CTX>( SSL_CTX_new( TLSv1_2_method() ), []( SSL_CTX * p ) {
-        SSL_CTX_free( p );
-    } );
+    std::shared_ptr<SSL_CTX> ctx = std::shared_ptr<SSL_CTX>(
+        SSL_CTX_new( TLSv1_2_method() ),
+        []( SSL_CTX* p ) {
+            SSL_CTX_free( p );
+        } );
 
     if( !SSL_CTX_set_cipher_list( ctx.get(), "HIGH:+CAMELLIA256:!eNull:!aNULL:!ADH:!MD5:-RSA+AES+SHA1:!RC4:!DES:!3DES:!SEED:!EXP:!AES128:!CAMELLIA128" ) ) {
         throw "Cannot set cipher list. Your source is broken.";
@@ -178,7 +184,7 @@ std::shared_ptr<BIO> openSerial( const std::string& name ) {
     return std::shared_ptr<BIO>(
         BIO_new_fd( fileno( f.get() ), 0 ),
         [f]( BIO* b ) {
-            BIO_free(b);
+            BIO_free( b );
         } );
 }
 
diff --git a/src/crypto/sslUtil.h b/src/crypto/sslUtil.h
index 1327a17..6ecb536 100644
--- a/src/crypto/sslUtil.h
+++ b/src/crypto/sslUtil.h
@@ -10,15 +10,16 @@
 
 #include "db/database.h"
 
-class CAConfig {
-public:
+struct CAConfig {
     std::string path;
     std::string name;
 
     std::shared_ptr<X509> ca;
     std::shared_ptr<EVP_PKEY> caKey;
     std::shared_ptr<ASN1_TIME> notBefore;
+
     CAConfig( const std::string& name );
+
     bool crlNeedsResign();
 };
 
@@ -49,4 +50,5 @@ std::shared_ptr<EVP_PKEY> loadPkeyFromFile( const std::string& filename );
 std::shared_ptr<SSL_CTX> generateSSLContext( bool server );
 std::shared_ptr<BIO> openSerial( const std::string& name );
 std::string timeToString( std::shared_ptr<ASN1_TIME> time );
+
 void extractTimes( std::shared_ptr<X509> source, std::shared_ptr<SignedCertificate> cert );
diff --git a/src/db/database.cpp b/src/db/database.cpp
index 7eabc17..4bb12b2 100644
--- a/src/db/database.cpp
+++ b/src/db/database.cpp
@@ -1 +1 @@
-#include "database.h"
+#include "db/database.h"
diff --git a/src/db/database.h b/src/db/database.h
index 6a3d5d7..31687b1 100644
--- a/src/db/database.h
+++ b/src/db/database.h
@@ -26,6 +26,7 @@ struct AVA {
 struct TBSCertificate {
     std::string md;
     std::string profile;
+
     /**
      * CSR path
      */
@@ -39,7 +40,6 @@ struct TBSCertificate {
     std::string wishTo;
 };
 
-
 struct SignedCertificate {
     std::string certificate;
     std::string serial;
diff --git a/src/db/mysql.cpp b/src/db/mysql.cpp
index db3a7b9..cf2bb7e 100644
--- a/src/db/mysql.cpp
+++ b/src/db/mysql.cpp
@@ -10,6 +10,7 @@
 std::shared_ptr<int> MySQLJobProvider::lib_ref(
     //Initializer: Store the return code as a pointer to an integer
     new int( mysql_library_init( 0, NULL, NULL ) ),
+
     //Finalizer: Check the pointer and free resources
     []( int* ref ) {
         if( !ref ) {
@@ -171,7 +172,6 @@ void MySQLJobProvider::finishJob( std::shared_ptr<Job> job ) {
     if( query( q ).first ) {
         throw "No database entry found.";
     }
-
 }
 
 void MySQLJobProvider::failJob( std::shared_ptr<Job> job ) {
diff --git a/src/io/recordHandler.cpp b/src/io/recordHandler.cpp
index 0e63805..a1d7b47 100644
--- a/src/io/recordHandler.cpp
+++ b/src/io/recordHandler.cpp
@@ -135,33 +135,35 @@ public:
             tbs->wishTo = data;
             break;
 
-        case RecordHeader::SignerCommand::ADD_SAN: {
-            size_t pos = data.find( "," );
-
-            if( pos == std::string::npos ) {
-                // error
-            } else {
-                std::shared_ptr<SAN> san( new SAN() );
-                san->type = data.substr( 0, pos );
-                san->content = data.substr( pos + 1 );
-                tbs->SANs.push_back( san );
+        case RecordHeader::SignerCommand::ADD_SAN:
+            {
+                size_t pos = data.find( "," );
+
+                if( pos == std::string::npos ) {
+                    // error
+                } else {
+                    std::shared_ptr<SAN> san( new SAN() );
+                    san->type = data.substr( 0, pos );
+                    san->content = data.substr( pos + 1 );
+                    tbs->SANs.push_back( san );
+                }
             }
-        }
-        break;
-
-        case RecordHeader::SignerCommand::ADD_AVA: {
-            size_t pos = data.find( "," );
-
-            if( pos == std::string::npos ) {
-                // error
-            } else {
-                std::shared_ptr<AVA> ava( new AVA() );
-                ava->name = data.substr( 0, pos );
-                ava->value = data.substr( pos + 1 );
-                tbs->AVAs.push_back( ava );
+            break;
+
+        case RecordHeader::SignerCommand::ADD_AVA:
+            {
+                size_t pos = data.find( "," );
+
+                if( pos == std::string::npos ) {
+                    // error
+                } else {
+                    std::shared_ptr<AVA> ava( new AVA() );
+                    ava->name = data.substr( 0, pos );
+                    ava->value = data.substr( pos + 1 );
+                    tbs->AVAs.push_back( ava );
+                }
             }
-        }
-        break;
+            break;
 
         case RecordHeader::SignerCommand::ADD_PROOF_LINE:
             break;
@@ -191,31 +193,32 @@ public:
             serials.push_back( data );
             break;
 
-        case RecordHeader::SignerCommand::REVOKE: {
-            std::string ca = data;
-            auto reqCA = CAs.at( ca );
-            logger::note( "CA found" );
-            std::shared_ptr<CRL> crl;
-            std::string date;
-            std::tie<std::shared_ptr<CRL>, std::string>( crl, date ) = signer->revoke( reqCA, serials );
-
-            respondCommand( RecordHeader::SignerResult::REVOKED, date + crl->getSignature() );
+        case RecordHeader::SignerCommand::REVOKE:
+            {
+                std::string ca = data;
+                auto reqCA = CAs.at( ca );
+                logger::note( "CA found" );
+                std::shared_ptr<CRL> crl;
+                std::string date;
+                std::tie<std::shared_ptr<CRL>, std::string>( crl, date ) = signer->revoke( reqCA, serials );
 
+                respondCommand( RecordHeader::SignerResult::REVOKED, date + crl->getSignature() );
+            }
             break;
-        }
 
-        case RecordHeader::SignerCommand::GET_FULL_CRL: {
-            auto ca = CAs.at( data );
-            CRL c( ca->path + "/ca.crl" );
-            respondCommand( RecordHeader::SignerResult::FULL_CRL, c.toString() );
+        case RecordHeader::SignerCommand::GET_FULL_CRL:
+            {
+                auto ca = CAs.at( data );
+                CRL c( ca->path + "/ca.crl" );
+                respondCommand( RecordHeader::SignerResult::FULL_CRL, c.toString() );
 
-            if( !SSL_shutdown( ssl.get() ) && !SSL_shutdown( ssl.get() ) ) {
-                logger::error( "ERROR: SSL shutdown failed." );
-            }
+                if( !SSL_shutdown( ssl.get() ) && !SSL_shutdown( ssl.get() ) ) {
+                    logger::error( "ERROR: SSL shutdown failed." );
+                }
 
-            parent->reset(); // Connection ended
+                parent->reset(); // Connection ended
+            }
             break;
-        }
 
         default:
             throw "Unimplemented";
@@ -223,8 +226,8 @@ public:
     }
 };
 
-DefaultRecordHandler::DefaultRecordHandler( std::shared_ptr<Signer> signer, std::shared_ptr<BIO> bio )
-    : bio( bio ), ctx( generateSSLContext( true ) ), signer( signer ), currentSession() {
+DefaultRecordHandler::DefaultRecordHandler( std::shared_ptr<Signer> signer, std::shared_ptr<BIO> bio ) :
+    bio( bio ), ctx( generateSSLContext( true ) ), signer( signer ), currentSession() {
 }
 
 void DefaultRecordHandler::reset() {
diff --git a/src/util.cpp b/src/util.cpp
index a052843..9e24b37 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -138,7 +138,6 @@ std::pair<bool, time_t> addMonths( std::time_t t, int32_t count ) {
     }
 
     return std::pair<bool, time_t>( true, res );
-
 }
 
 std::pair<bool, time_t> parseMonthInterval( std::time_t t, const std::string& date ) {
@@ -161,6 +160,7 @@ std::pair<bool, time_t> parseMonthInterval( std::time_t t, const std::string& da
         return std::pair<bool, time_t>( false, 0 );
     }
 }
+
 std::pair<bool, time_t> parseYearInterval( std::time_t t, const std::string& date ) {
     if( date[date.size() - 1] != 'y' ) {
         return  std::pair<bool, time_t>( false, 0 );