fmt: Whitespace, indentation, generic source formatting

[cassiopeia.git] / src / crypto / sslUtil.cpp

diff --git a/src/crypto/sslUtil.cpp b/src/crypto/sslUtil.cpp
index d0df60c9d7a3f5171b093e8bf1421ede90a6bee9..d4f55da86b33247c6d9a228f7ab04f416bd4d291 100644 (file)
--- a/src/crypto/sslUtil.cpp
+++ b/src/crypto/sslUtil.cpp
@@ -7,6 +7,7 @@
 #include <iostream>
 
 #include "crypto/CRL.h"
+#include "log/logger.hpp"
 
 std::shared_ptr<int> ssl_lib_ref(
     new int( SSL_library_init() ),
@@ -32,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>();
@@ -56,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 );
         } );
 }
@@ -65,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;
 }
 
@@ -76,7 +81,7 @@ static int verify_callback( int preverify_ok, X509_STORE_CTX* ctx ) {
         //X509_print_ex(o, cert, XN_FLAG_COMPAT, X509_FLAG_COMPAT);
         //BIO_free(o);
 
-        std::cout << "Verification failed: " << preverify_ok << " because " << X509_STORE_CTX_get_error( ctx ) << std::endl;
+        logger::errorf( "Verification failed: %s because %s", preverify_ok, X509_STORE_CTX_get_error( ctx ) );
     }
 
     return preverify_ok;
@@ -85,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.";
@@ -117,7 +124,7 @@ std::shared_ptr<SSL_CTX> generateSSLContext( bool server ) {
                 dh_param = std::shared_ptr<DH>( PEM_read_DHparams( paramfile.get(), NULL, NULL, NULL ), DH_free );
             } else {
                 dh_param = std::shared_ptr<DH>( DH_new(), DH_free );
-                std::cout << "Generating DH params" << std::endl;
+                logger::note( "Generating DH params" );
                 BN_GENCB cb;
                 cb.ver = 2;
                 cb.arg = 0;
@@ -169,7 +176,7 @@ std::shared_ptr<BIO> openSerial( const std::string& name ) {
     std::shared_ptr<FILE> f( fopen( name.c_str(), "r+" ), fclose );
 
     if( !f ) {
-        std::cout << "Opening serial device failed" << std::endl;
+        logger::error( "Opening serial device failed." );
         return std::shared_ptr<BIO>();
     }
 
@@ -177,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 );
         } );
 }