From 9c88683457862a86656172dfba127717bf41b86a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 23 Apr 2017 14:14:24 +0000 Subject: [PATCH] fmt: extract lambdas to make them better formatted Change-Id: Ice57713c46e7c671e5e3440d7b9b6ed624ef73ee --- src/apps/client.cpp | 9 +++--- src/crypto/X509.cpp | 22 ++++++------- src/crypto/remoteSigner.cpp | 9 +++--- src/crypto/simpleOpensslSigner.cpp | 9 +++--- src/crypto/sslUtil.cpp | 51 ++++++++++++++---------------- src/io/recordHandler.cpp | 9 +++--- src/log/format.cpp | 6 ++-- src/log/logger.cpp | 12 +++---- 8 files changed, 59 insertions(+), 68 deletions(-) diff --git a/src/apps/client.cpp b/src/apps/client.cpp index f044c2b..92a2369 100644 --- a/src/apps/client.cpp +++ b/src/apps/client.cpp @@ -106,11 +106,10 @@ int main( int argc, const char *argv[] ) { if( lastCRLCheck + 30 * 60 < current ) { // todo set good log TODO FIXME - sign->setLog( std::shared_ptr( - &std::cout, - []( std::ostream* o ) { - ( void ) o; - } ) ); + auto ostreamFree = []( std::ostream * o ) { + ( void ) o; + }; + sign->setLog( std::shared_ptr( &std::cout, ostreamFree ) ); checkCRLs( sign ); lastCRLCheck = current; } diff --git a/src/crypto/X509.cpp b/src/crypto/X509.cpp index aad5c8f..d99ab68 100644 --- a/src/crypto/X509.cpp +++ b/src/crypto/X509.cpp @@ -190,13 +190,12 @@ void X509Cert::setExtensions( std::shared_ptr caCert, std::vector gens = std::shared_ptr( - sk_GENERAL_NAME_new_null(), - []( GENERAL_NAMES * ref ) { - if( ref ) { - sk_GENERAL_NAME_pop_free( ref, GENERAL_NAME_free ); - } - } ); + auto freeGeneralNames = []( GENERAL_NAMES * ref ) { + if( ref ) { + sk_GENERAL_NAME_pop_free( ref, GENERAL_NAME_free ); + } + }; + std::shared_ptr gens = std::shared_ptr( sk_GENERAL_NAME_new_null(), freeGeneralNames ); for( auto& name : sans ) { GENERAL_NAME *gen = GENERAL_NAME_new(); @@ -270,11 +269,10 @@ std::shared_ptr X509Cert::sign( std::shared_ptr caK throw std::runtime_error( "Failed to retrieve certificate serial of signed certificate." ); } - std::shared_ptr serStr( - BN_bn2hex( ser.get() ), - []( char* p ) { - OPENSSL_free( p ); - } ); // OPENSSL_free is a macro... + auto freeMem = []( char *p ) { + OPENSSL_free( p ); + };// OPENSSL_free is a macro... + std::shared_ptr serStr( BN_bn2hex( ser.get() ), freeMem ); res->serial = serStr ? std::string( serStr.get() ) : ""; return res; diff --git a/src/crypto/remoteSigner.cpp b/src/crypto/remoteSigner.cpp index f0cf105..64ccebf 100644 --- a/src/crypto/remoteSigner.cpp +++ b/src/crypto/remoteSigner.cpp @@ -121,11 +121,10 @@ std::shared_ptr RemoteSigner::sign( std::shared_ptr ser( ASN1_INTEGER_to_BN( X509_get_serialNumber( pem.get() ), NULL ), BN_free ); - std::shared_ptr serStr( - BN_bn2hex( ser.get() ), - []( char* p ) { - OPENSSL_free( p ); - } ); // OPENSSL_free is a macro... + auto freeMem = []( char *p ) { + OPENSSL_free( p ); + }; // OPENSSL_free is a macro... + std::shared_ptr serStr( BN_bn2hex( ser.get() ), freeMem ); extractTimes( pem, result ); diff --git a/src/crypto/simpleOpensslSigner.cpp b/src/crypto/simpleOpensslSigner.cpp index d5371ba..6cf10d0 100644 --- a/src/crypto/simpleOpensslSigner.cpp +++ b/src/crypto/simpleOpensslSigner.cpp @@ -60,11 +60,10 @@ std::pair, std::string> SimpleOpensslSigner::nextSerial( throw std::runtime_error( "Big number math failed while fetching random data for serial number." ); } - std::shared_ptr serStr = std::shared_ptr( - BN_bn2hex( serial.get() ), - []( char* ref ) { - OPENSSL_free( ref ); - } ); + auto freeMem = []( char *ref ) { + OPENSSL_free( ref ); + }; + std::shared_ptr serStr = std::shared_ptr( BN_bn2hex( serial.get() ), freeMem ); writeFile( ca->path + "/serial", serStr.get() ); diff --git a/src/crypto/sslUtil.cpp b/src/crypto/sslUtil.cpp index 506e27f..94e963e 100644 --- a/src/crypto/sslUtil.cpp +++ b/src/crypto/sslUtil.cpp @@ -9,6 +9,7 @@ #include "crypto/CRL.h" #include "log/logger.hpp" +// *INDENT-OFF* std::shared_ptr ssl_lib_ref( new int( SSL_library_init() ), []( int* ref ) { @@ -17,6 +18,7 @@ std::shared_ptr ssl_lib_ref( EVP_cleanup(); CRYPTO_cleanup_all_ex_data(); } ); +// *INDENT-ON* std::shared_ptr loadX509FromFile( const std::string& filename ) { std::shared_ptr f( fopen( filename.c_str(), "r" ), fclose ); @@ -31,21 +33,19 @@ std::shared_ptr loadX509FromFile( const std::string& filename ) { return std::shared_ptr(); } - return std::shared_ptr( - key, - []( X509* ref ) { - X509_free( ref ); - } ); + auto freeX509 = []( X509 * ref ) { + X509_free( ref ); + }; + return std::shared_ptr( key, freeX509 ); } std::shared_ptr loadPkeyFromFile( const std::string& filename ) { - std::shared_ptr f( - fopen( filename.c_str(), "r" ), - []( FILE* ptr ) { - if( ptr ) { - fclose( ptr ); - } - } ); + auto freeFile = []( FILE * ptr ) { + if( ptr ) { + fclose( ptr ); + } + }; + std::shared_ptr f( fopen( filename.c_str(), "r" ), freeFile ); if( !f ) { return std::shared_ptr(); @@ -57,11 +57,10 @@ std::shared_ptr loadPkeyFromFile( const std::string& filename ) { return std::shared_ptr(); } - return std::shared_ptr( - key, - []( EVP_PKEY* ref ) { - EVP_PKEY_free( ref ); - } ); + auto freeKey = []( EVP_PKEY * ref ) { + EVP_PKEY_free( ref ); + }; + return std::shared_ptr( key, freeKey ); } int gencb( int a, int b, BN_GENCB *g ) { @@ -90,11 +89,10 @@ static int verify_callback( int preverify_ok, X509_STORE_CTX *ctx ) { static std::shared_ptr dh_param; std::shared_ptr generateSSLContext( bool server ) { - std::shared_ptr ctx = std::shared_ptr( - SSL_CTX_new( TLS_method() ), - []( SSL_CTX* p ) { - SSL_CTX_free( p ); - } ); + auto freeSSL = []( SSL_CTX * p ) { + SSL_CTX_free( p ); + }; + std::shared_ptr ctx = std::shared_ptr( SSL_CTX_new( TLS_method() ), freeSSL ); 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 std::runtime_error( "Cannot set cipher list. Your source is broken." ); @@ -181,11 +179,10 @@ std::shared_ptr openSerial( const std::string& name ) { } setupSerial( f ); - return std::shared_ptr( - BIO_new_fd( fileno( f.get() ), 0 ), - [f]( BIO* b ) { - BIO_free( b ); - } ); + auto freeBIO = [f]( BIO * b ) { + BIO_free( b ); + }; + return std::shared_ptr( BIO_new_fd( fileno( f.get() ), 0 ), freeBIO ); } extern std::string crlPrefix; diff --git a/src/io/recordHandler.cpp b/src/io/recordHandler.cpp index 8dc105e..7b48c6e 100644 --- a/src/io/recordHandler.cpp +++ b/src/io/recordHandler.cpp @@ -51,11 +51,10 @@ public: this->signer = signer; ssl = std::shared_ptr( SSL_new( ctx.get() ), SSL_free ); - std::shared_ptr bio( - BIO_new( BIO_f_ssl() ), - [output]( BIO * p ) { - BIO_free( p ); - } ); + auto freeBIO = [output]( BIO * p ) { + BIO_free( p ); + }; + std::shared_ptr bio( BIO_new( BIO_f_ssl() ), freeBIO ); SSL_set_accept_state( ssl.get() ); SSL_set_bio( ssl.get(), output.get(), output.get() ); BIO_set_ssl( bio.get(), ssl.get(), BIO_NOCLOSE ); diff --git a/src/log/format.cpp b/src/log/format.cpp index 8f7b36f..180bb55 100644 --- a/src/log/format.cpp +++ b/src/log/format.cpp @@ -29,9 +29,9 @@ namespace logger { if( std::isdigit( *it ) ) { const auto w_end = std::find_if_not( it, end, - []( char c ) { - return std::isdigit( c ); - } ); + []( char c ) { + return std::isdigit( c ); + } ); retval.width = std::stoul( std::string{it, w_end} ); it = w_end; } diff --git a/src/log/logger.cpp b/src/log/logger.cpp index 27ec372..097d019 100644 --- a/src/log/logger.cpp +++ b/src/log/logger.cpp @@ -87,9 +87,9 @@ namespace logger { m_loggers{lst}, m_min_level{default_level} { if( lst.size() > 0 ) { m_min_level = std::min_element( lst.begin(), lst.end(), - []( const log_target& l, const log_target& r ) { - return l.min_level < r.min_level; - } )->min_level; + []( const log_target & l, const log_target & r ) { + return l.min_level < r.min_level; + } )->min_level; } if( r == auto_register::on ) { @@ -222,9 +222,9 @@ namespace logger { const auto length = prefix.length(); const auto fmt = replace_newlines( format, length ); std::transform( args.begin(), args.end(), args.begin(), - [length]( const std::string & str ) { - return replace_newlines( str, length ); - } ); + [length]( const std::string & str ) { + return replace_newlines( str, length ); + } ); auto msg = prefix; auto arg_index = std::size_t {0}; -- 2.39.2