From da9f337a893bd317460118f89efa83a3427f797f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 23 Apr 2017 11:10:51 +0000 Subject: [PATCH] fmt: run format script excluding lambdas Change-Id: Icb292c8c3298f924398eccaadeb3d164721e9bc7 --- src/apps/client.cpp | 13 ++-- src/apps/signer.cpp | 10 +-- src/config.cpp | 8 +- src/crypto/CRL.cpp | 60 +++++++-------- src/crypto/X509.cpp | 44 +++++------ src/crypto/X509.h | 4 +- src/crypto/remoteSigner.cpp | 16 ++-- src/crypto/simpleOpensslSigner.cpp | 10 +-- src/crypto/sslUtil.cpp | 20 +++-- src/io/bios.cpp | 28 +++---- src/io/bios.h | 62 ++++++++-------- src/io/opensslBIO.cpp | 12 +-- src/io/opensslBIO.h | 12 +-- src/io/record.h | 2 +- src/io/recordHandler.cpp | 114 ++++++++++++++--------------- src/io/slipBio.cpp | 12 +-- src/io/slipBio.h | 8 +- src/log/format.cpp | 2 +- src/log/format.hpp | 14 ++-- src/log/logger.cpp | 8 +- src/log/logger.hpp | 12 +-- src/util.cpp | 4 +- src/util.h | 12 +-- test/src/bioWrapper.cpp | 20 ++--- test/src/log.cpp | 6 +- test/src/slipBioTest.cpp | 18 ++--- 26 files changed, 267 insertions(+), 264 deletions(-) diff --git a/src/apps/client.cpp b/src/apps/client.cpp index ceb2677..f044c2b 100644 --- a/src/apps/client.cpp +++ b/src/apps/client.cpp @@ -46,13 +46,13 @@ void checkCRLs( std::shared_ptr sign ) { try { std::vector serials; std::pair, std::string> rev = sign->revoke( x.second, serials ); - } catch( const std::exception &e ) { + } catch( const std::exception& e ) { logger::error( "Exception: ", e.what() ); } } } -int main( int argc, const char* argv[] ) { +int main( int argc, const char *argv[] ) { bool once = false; bool resetOnly = false; @@ -86,7 +86,7 @@ int main( int argc, const char* argv[] ) { std::shared_ptr b = openSerial( serialPath ); std::shared_ptr m( toBio(), BIO_meth_free ); std::shared_ptr slip1( BIO_new( m.get() ), BIO_free ); - static_cast( slip1->ptr )->setTarget( std::make_shared( b ), false ); + static_cast( slip1->ptr )->setTarget( std::make_shared( b ), false ); auto sign = std::make_shared( slip1, generateSSLContext( false ) ); // std::shared_ptr sign( new SimpleOpensslSigner() ); @@ -119,7 +119,7 @@ int main( int argc, const char* argv[] ) { try { job = jp->fetchJob(); - } catch ( std::exception &e ){ + } catch( std::exception& e ) { logger::errorf( "Exception while fetchJob: %s", e.what() ); } @@ -140,6 +140,7 @@ int main( int argc, const char* argv[] ) { if( job->task == "sign" ) { try { std::shared_ptr cert = jp->fetchTBSCert( job ); + if( !cert ) { logger::error( "Unable to load CSR" ); jp->failJob( job ); @@ -209,7 +210,7 @@ int main( int argc, const char* argv[] ) { logger::note( "revoking" ); std::pair, std::string> rev = sign->revoke( CAs.at( data.second ), serials ); std::string date = rev.second; - const unsigned char* pos = ( const unsigned char* ) date.data(); + const unsigned char *pos = ( const unsigned char * ) date.data(); std::shared_ptr time( d2i_ASN1_TIME( NULL, &pos, date.size() ), ASN1_TIME_free ); jp->writeBackRevocation( job, timeToString( time ) ); @@ -225,7 +226,7 @@ int main( int argc, const char* argv[] ) { if( !DAEMON || once ) { return 0; } - } catch ( std::exception &e ){ + } catch( std::exception& e ) { logger::errorf( "std::exception in mainloop: %s", e.what() ); } diff --git a/src/apps/signer.cpp b/src/apps/signer.cpp index 80b5a71..d2d01d9 100644 --- a/src/apps/signer.cpp +++ b/src/apps/signer.cpp @@ -23,7 +23,7 @@ extern std::string serialPath; -int main( int argc, const char* argv[] ) try { +int main( int argc, const char *argv[] ) try { ( void ) argc; ( void ) argv; @@ -49,9 +49,9 @@ int main( int argc, const char* argv[] ) try { std::shared_ptr conn = openSerial( serialPath ); std::shared_ptr slip1( BIO_new( toBio() ), BIO_free ); - static_cast( slip1->ptr )->setTarget( std::shared_ptr( new OpensslBIOWrapper( conn ) ), true ); + static_cast( slip1->ptr )->setTarget( std::shared_ptr( new OpensslBIOWrapper( conn ) ), true ); - DefaultRecordHandler* dh = new DefaultRecordHandler( std::shared_ptr( new SimpleOpensslSigner( ) ), slip1 ); + DefaultRecordHandler *dh = new DefaultRecordHandler( std::shared_ptr( new SimpleOpensslSigner( ) ), slip1 ); logger::note( "Entering mainloop" ); @@ -70,7 +70,7 @@ int main( int argc, const char* argv[] ) try { } catch( std::exception& e ) { try { logger::fatalf( "Fatal Error: %s!\n", e.what() ); - }catch( std::exception &e){ + } catch( std::exception& e ) { printf( "Fatal Error (+logger failed): %s!\n", e.what() ); } @@ -78,7 +78,7 @@ int main( int argc, const char* argv[] ) try { } catch( ... ) { try { logger::fatal( "Fatal Error: Unknown Exception!\n" ); - }catch( std::exception &e){ + } catch( std::exception& e ) { printf( "Fatal Error (+ logger failed): %s!\n", e.what() ); } diff --git a/src/config.cpp b/src/config.cpp index a4d3284..d078179 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -53,8 +53,8 @@ std::shared_ptr> parseConf( std::st int parseProfiles() { CAs = std::unordered_map>(); - DIR* dp; - struct dirent* ep; + DIR *dp; + struct dirent *ep; dp = opendir( "profiles" ); if( dp == NULL ) { @@ -95,8 +95,8 @@ int parseProfiles() { std::string cas = map->at( "ca" ); - DIR* dir; - struct dirent* ent; + DIR *dir; + struct dirent *ent; if( ( dir = opendir( "ca" ) ) != NULL ) { while( ( ent = readdir( dir ) ) != NULL ) { diff --git a/src/crypto/CRL.cpp b/src/crypto/CRL.cpp index f9159fc..1dc3da8 100644 --- a/src/crypto/CRL.cpp +++ b/src/crypto/CRL.cpp @@ -14,7 +14,7 @@ CRL::CRL( std::string path ) { } std::string CRL::revoke( std::string serial, std::string time ) { - BIGNUM* serBN = 0; + BIGNUM *serBN = 0; logger::note( "parsing serial" ); @@ -39,7 +39,7 @@ std::string CRL::revoke( std::string serial, std::string time ) { X509_gmtime_adj( tmptm.get(), 0 ); logger::note( "creating entry" ); - X509_REVOKED* rev = X509_REVOKED_new(); + X509_REVOKED *rev = X509_REVOKED_new(); X509_REVOKED_set_serialNumber( rev, ser.get() ); if( time != "" ) { @@ -51,10 +51,10 @@ std::string CRL::revoke( std::string serial, std::string time ) { X509_CRL_add0_revoked( crl.get(), rev ); int len = i2d_ASN1_TIME( tmptm.get(), NULL ); - unsigned char* buffer = ( unsigned char* ) OPENSSL_malloc( len ); - unsigned char* pos = buffer; + unsigned char *buffer = ( unsigned char * ) OPENSSL_malloc( len ); + unsigned char *pos = buffer; i2d_ASN1_TIME( tmptm.get(), &pos ); - std::string rettime = std::string( ( char* ) buffer, len ); + std::string rettime = std::string( ( char * ) buffer, len ); OPENSSL_free( buffer ); return rettime; } @@ -105,7 +105,7 @@ std::string CRL::toString() { // Write out the new CRL std::shared_ptr mem( BIO_new( BIO_s_mem() ), BIO_free ); PEM_write_bio_X509_CRL( mem.get(), crl.get() ); - BUF_MEM* bptr; + BUF_MEM *bptr; BIO_get_mem_ptr( mem.get(), &bptr ); std::string newCRL( bptr->data, bptr->length ); return newCRL; @@ -116,18 +116,18 @@ std::string CRL::getSignature() { const ASN1_BIT_STRING *psig; X509_CRL_get0_signature( crl.get(), &psig, &palg ); - int len = i2d_X509_ALGOR( const_cast( palg ), NULL ); - len += i2d_ASN1_BIT_STRING( const_cast( psig ), NULL ); - len += i2d_ASN1_TIME( const_cast( X509_CRL_get0_lastUpdate( crl.get() ) ), NULL ); - len += i2d_ASN1_TIME( const_cast( X509_CRL_get0_nextUpdate( crl.get() ) ), NULL ); - - unsigned char* buffer = ( unsigned char* ) OPENSSL_malloc( len ); - unsigned char* pos = buffer; - i2d_X509_ALGOR( const_cast( palg ), &pos ); - i2d_ASN1_BIT_STRING( const_cast( psig ), &pos ); - i2d_ASN1_TIME( const_cast( X509_CRL_get0_lastUpdate( crl.get() ) ), &pos ); - i2d_ASN1_TIME( const_cast( X509_CRL_get0_nextUpdate( crl.get() ) ), &pos ); - std::string res = std::string( ( char* ) buffer, len ); + int len = i2d_X509_ALGOR( const_cast( palg ), NULL ); + len += i2d_ASN1_BIT_STRING( const_cast( psig ), NULL ); + len += i2d_ASN1_TIME( const_cast( X509_CRL_get0_lastUpdate( crl.get() ) ), NULL ); + len += i2d_ASN1_TIME( const_cast( X509_CRL_get0_nextUpdate( crl.get() ) ), NULL ); + + unsigned char *buffer = ( unsigned char * ) OPENSSL_malloc( len ); + unsigned char *pos = buffer; + i2d_X509_ALGOR( const_cast( palg ), &pos ); + i2d_ASN1_BIT_STRING( const_cast( psig ), &pos ); + i2d_ASN1_TIME( const_cast( X509_CRL_get0_lastUpdate( crl.get() ) ), &pos ); + i2d_ASN1_TIME( const_cast( X509_CRL_get0_nextUpdate( crl.get() ) ), &pos ); + std::string res = std::string( ( char * ) buffer, len ); OPENSSL_free( buffer ); return res; @@ -138,23 +138,23 @@ void CRL::setSignature( std::string signature ) { X509_ALGOR *palg; ASN1_BIT_STRING *psig; // this is not intended use of the OPENSSL-API but API-limitations leave us with no other options. - X509_CRL_get0_signature(crl.get(), const_cast(&psig), const_cast(&palg)); + X509_CRL_get0_signature( crl.get(), const_cast( &psig ), const_cast( &palg ) ); - const unsigned char* data = ( unsigned char* )( signature.data() ); - const unsigned char* buffer = data; + const unsigned char *data = ( unsigned char * )( signature.data() ); + const unsigned char *buffer = data; X509_ALGOR *alg = d2i_X509_ALGOR( NULL, &buffer, signature.size() ); ASN1_BIT_STRING *sig = d2i_ASN1_BIT_STRING( NULL, &buffer, signature.size() + data - buffer ); ASN1_TIME *a1 = d2i_ASN1_TIME( NULL, &buffer, signature.size() + data - buffer ); ASN1_TIME *a2 = d2i_ASN1_TIME( NULL, &buffer, signature.size() + data - buffer ); - std::swap(*palg, *alg); - std::swap(*psig, *sig); - X509_CRL_set1_lastUpdate( crl.get(), a1); - X509_CRL_set1_nextUpdate( crl.get(), a2); - - X509_ALGOR_free(alg); - ASN1_BIT_STRING_free(sig); - ASN1_TIME_free(a1); - ASN1_TIME_free(a2); + std::swap( *palg, *alg ); + std::swap( *psig, *sig ); + X509_CRL_set1_lastUpdate( crl.get(), a1 ); + X509_CRL_set1_nextUpdate( crl.get(), a2 ); + + X509_ALGOR_free( alg ); + ASN1_BIT_STRING_free( sig ); + ASN1_TIME_free( a1 ); + ASN1_TIME_free( a2 ); } bool CRL::needsResign() { diff --git a/src/crypto/X509.cpp b/src/crypto/X509.cpp index e304b90..aad5c8f 100644 --- a/src/crypto/X509.cpp +++ b/src/crypto/X509.cpp @@ -7,8 +7,8 @@ #include #include -X509Req::X509Req( X509_REQ* csr ) : req( csr, X509_REQ_free ) { - EVP_PKEY* pkt = X509_REQ_get_pubkey( req.get() ); +X509Req::X509Req( X509_REQ *csr ) : req( csr, X509_REQ_free ) { + EVP_PKEY *pkt = X509_REQ_get_pubkey( req.get() ); if( !pkt ) { throw std::runtime_error( "Error extracting public key" ); @@ -23,14 +23,14 @@ X509Req::X509Req( std::string spkac ) { } spkac = spkac.substr( 6 ); - NETSCAPE_SPKI* spki_p = NETSCAPE_SPKI_b64_decode( spkac.c_str(), spkac.size() ); + NETSCAPE_SPKI *spki_p = NETSCAPE_SPKI_b64_decode( spkac.c_str(), spkac.size() ); if( !spki_p ) { throw std::runtime_error( "Error: decode failed" ); } spki = std::shared_ptr( spki_p, NETSCAPE_SPKI_free ); - EVP_PKEY* pkt_p = NETSCAPE_SPKI_get_pubkey( spki.get() ); + EVP_PKEY *pkt_p = NETSCAPE_SPKI_get_pubkey( spki.get() ); if( !pkt_p ) { throw std::runtime_error( "Error: reading SPKAC Pubkey failed" ); @@ -52,8 +52,8 @@ std::shared_ptr X509Req::getPkey() const { } std::shared_ptr X509Req::parseCSR( std::string content ) { - std::shared_ptr in = std::shared_ptr( BIO_new_mem_buf( const_cast( content.c_str() ), -1 ), BIO_free ); - X509_REQ* req = PEM_read_bio_X509_REQ( in.get(), NULL, NULL, NULL ); + std::shared_ptr in = std::shared_ptr( BIO_new_mem_buf( const_cast( content.c_str() ), -1 ), BIO_free ); + X509_REQ *req = PEM_read_bio_X509_REQ( in.get(), NULL, NULL, NULL ); if( !req ) { throw std::runtime_error( "Error parsing CSR" ); @@ -66,8 +66,8 @@ std::shared_ptr X509Req::parseSPKAC( std::string content ) { return std::shared_ptr( new X509Req( content ) ); } -int add_ext( std::shared_ptr issuer, std::shared_ptr subj, int nid, const char* value ) { - X509_EXTENSION* ex; +int add_ext( std::shared_ptr issuer, std::shared_ptr subj, int nid, const char *value ) { + X509_EXTENSION *ex; X509V3_CTX ctx; /* This sets the 'context' of the extensions. */ @@ -78,7 +78,7 @@ int add_ext( std::shared_ptr issuer, std::shared_ptr subj, int nid, * no request and no CRL */ X509V3_set_ctx( &ctx, issuer.get(), subj.get(), NULL, NULL, 0 ); - ex = X509V3_EXT_conf_nid( NULL, &ctx, nid, const_cast( value ) ); + ex = X509V3_EXT_conf_nid( NULL, &ctx, nid, const_cast( value ) ); if( !ex ) { return 0; @@ -91,7 +91,7 @@ int add_ext( std::shared_ptr issuer, std::shared_ptr subj, int nid, } X509Cert::X509Cert() { - X509* c = X509_new(); + X509 *c = X509_new(); if( !c ) { throw std::runtime_error( "malloc failed" ); @@ -103,7 +103,7 @@ X509Cert::X509Cert() { throw std::runtime_error( "Setting X509-version to 3 failed" ); } - X509_NAME* subjectP = X509_NAME_new(); + X509_NAME *subjectP = X509_NAME_new(); if( !subjectP ) { throw std::runtime_error( "malloc failure in construct." ); @@ -113,7 +113,7 @@ X509Cert::X509Cert() { } void X509Cert::addRDN( int nid, std::string data ) { - if( ! X509_NAME_add_entry_by_NID( subject.get(), nid, MBSTRING_UTF8, ( unsigned char* )const_cast( data.data() ), data.size(), -1, 0 ) ) { + if( ! X509_NAME_add_entry_by_NID( subject.get(), nid, MBSTRING_UTF8, ( unsigned char * )const_cast( data.data() ), data.size(), -1, 0 ) ) { throw std::runtime_error( "malloc failure in RDN" ); } } @@ -132,8 +132,8 @@ void X509Cert::setPubkeyFrom( std::shared_ptr req ) { } } -void X509Cert::setSerialNumber( BIGNUM* num ) { - ASN1_INTEGER *i = BN_to_ASN1_INTEGER( num, NULL); +void X509Cert::setSerialNumber( BIGNUM *num ) { + ASN1_INTEGER *i = BN_to_ASN1_INTEGER( num, NULL ); X509_set_serialNumber( target.get(), i ); ASN1_INTEGER_free( i ); } @@ -143,11 +143,11 @@ void X509Cert::setTimes( uint32_t before, uint32_t after ) { ASN1_TIME_set( X509_get_notAfter( target.get() ), after ); } -static X509_EXTENSION* do_ext_i2d( int ext_nid, int crit, ASN1_VALUE* ext_struc ) { - unsigned char* ext_der; +static X509_EXTENSION *do_ext_i2d( int ext_nid, int crit, ASN1_VALUE *ext_struc ) { + unsigned char *ext_der; int ext_len; - ASN1_OCTET_STRING* ext_oct; - X509_EXTENSION* ext; + ASN1_OCTET_STRING *ext_oct; + X509_EXTENSION *ext; /* Convert internal representation to DER */ ext_der = NULL; ext_len = ASN1_item_i2d( ext_struc, &ext_der, ASN1_ITEM_ptr( ASN1_ITEM_ref( GENERAL_NAMES ) ) ); @@ -199,7 +199,7 @@ void X509Cert::setExtensions( std::shared_ptr caCert, std::vector caCert, std::vector X509Cert::sign( std::shared_ptr caK throw std::runtime_error( "error setting subject" ); } - const EVP_MD* md; + const EVP_MD *md; if( signAlg == "sha512" ) { md = EVP_sha512(); @@ -258,7 +258,7 @@ std::shared_ptr X509Cert::sign( std::shared_ptr caK PEM_write_bio_X509( mem.get(), target.get() ); - BUF_MEM* buf = NULL; + BUF_MEM *buf = NULL; BIO_get_mem_ptr( mem.get(), &buf ); auto res = std::make_shared(); diff --git a/src/crypto/X509.h b/src/crypto/X509.h index 71b0de1..b339627 100644 --- a/src/crypto/X509.h +++ b/src/crypto/X509.h @@ -13,7 +13,7 @@ private: std::shared_ptr pk; std::shared_ptr req; std::shared_ptr spki; - X509Req( X509_REQ* csr ); + X509Req( X509_REQ *csr ); X509Req( std::string spkac ); public: static std::shared_ptr parseCSR( std::string content ); @@ -31,7 +31,7 @@ public: void addRDN( int nid, std::string data ); void setIssuerNameFrom( std::shared_ptr ca ); void setPubkeyFrom( std::shared_ptr r ); - void setSerialNumber( BIGNUM* num ); + void setSerialNumber( BIGNUM *num ); void setExtensions( std::shared_ptr caCert, std::vector>& sans, Profile& prof, std::string crlURL, std::string crtURL ); void setTimes( uint32_t before, uint32_t after ); std::shared_ptr sign( std::shared_ptr caKey, std::string signAlg ); diff --git a/src/crypto/remoteSigner.cpp b/src/crypto/remoteSigner.cpp index c52936b..f0cf105 100644 --- a/src/crypto/remoteSigner.cpp +++ b/src/crypto/remoteSigner.cpp @@ -48,7 +48,7 @@ std::shared_ptr RemoteSigner::sign( std::shared_ptrwishFrom ); send( conn, head, RecordHeader::SignerCommand::SET_WISH_TO, cert->wishTo ); - for( auto &ava : cert->AVAs ) { + for( auto& ava : cert->AVAs ) { if( ava->name.find( "," ) != std::string::npos ) { // invalid ava return nullptr; @@ -57,7 +57,7 @@ std::shared_ptr RemoteSigner::sign( std::shared_ptrname + "," + ava->value ); } - for( auto &san : cert->SANs ) { + for( auto& san : cert->SANs ) { if( san->type.find( "," ) != std::string::npos ) { // invalid ava return nullptr; @@ -100,7 +100,7 @@ std::shared_ptr RemoteSigner::sign( std::shared_ptr bios( BIO_new( BIO_s_mem() ), BIO_free ); - const char* buf = result->certificate.data(); + const char *buf = result->certificate.data(); unsigned int len = result->certificate.size(); while( len > 0 ) { @@ -157,7 +157,7 @@ std::pair, std::string> RemoteSigner::revoke( std::shared_p head.flags = 0; head.sessid = 13; - for( auto &serial : serials ) { + for( auto& serial : serials ) { send( conn, head, RecordHeader::SignerCommand::ADD_SERIAL, serial ); } @@ -174,14 +174,14 @@ std::pair, std::string> RemoteSigner::revoke( std::shared_p throw std::runtime_error( "Protocol violation" ); } - const unsigned char* buffer2 = reinterpret_cast( payload.data() ); - const unsigned char* pos = buffer2; - ASN1_TIME* time = d2i_ASN1_TIME( NULL, &pos, payload.size() ); + const unsigned char *buffer2 = reinterpret_cast( payload.data() ); + const unsigned char *pos = buffer2; + ASN1_TIME *time = d2i_ASN1_TIME( NULL, &pos, payload.size() ); ASN1_TIME_free( time ); date = payload.substr( 0, pos - buffer2 ); std::string rest = payload.substr( pos - buffer2 ); - for( std::string &serial : serials ) { + for( std::string& serial : serials ) { crl->revoke( serial, date ); } diff --git a/src/crypto/simpleOpensslSigner.cpp b/src/crypto/simpleOpensslSigner.cpp index b569ef2..d5371ba 100644 --- a/src/crypto/simpleOpensslSigner.cpp +++ b/src/crypto/simpleOpensslSigner.cpp @@ -31,7 +31,7 @@ std::pair, 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(); @@ -47,7 +47,7 @@ std::pair, std::string> SimpleOpensslSigner::nextSerial( std::shared_ptr serial = std::shared_ptr( bn, BN_free ); - std::shared_ptr data = std::shared_ptr( ( unsigned char* ) malloc( BN_num_bytes( serial.get() ) + 20 ), free ); + std::shared_ptr data = std::shared_ptr( ( unsigned char * ) malloc( BN_num_bytes( serial.get() ) + 20 ), free ); int len = BN_bn2bin( serial.get(), data.get() ); data.get()[len] = 0x0; @@ -217,17 +217,17 @@ std::shared_ptr SimpleOpensslSigner::sign( std::shared_ptr timebuf; timeobj = gmtime( &from ); timebuf.resize( 128 ); - timebuf.resize( std::strftime( const_cast( timebuf.data() ), timebuf.size(), "%F %T %Z", timeobj ) ); + timebuf.resize( std::strftime( const_cast( 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( timebuf.data() ), timebuf.size(), "%F %T %Z", timeobj ) ); + timebuf.resize( std::strftime( const_cast( timebuf.data() ), timebuf.size(), "%F %T %Z", timeobj ) ); logger::note( "FINE: - Valid not after: ", std::string( timebuf.cbegin(), timebuf.cend() ) ); } } diff --git a/src/crypto/sslUtil.cpp b/src/crypto/sslUtil.cpp index 8a68c61..506e27f 100644 --- a/src/crypto/sslUtil.cpp +++ b/src/crypto/sslUtil.cpp @@ -25,7 +25,7 @@ std::shared_ptr loadX509FromFile( const std::string& filename ) { return std::shared_ptr(); } - X509* key = PEM_read_X509( f.get(), NULL, NULL, 0 ); + X509 *key = PEM_read_X509( f.get(), NULL, NULL, 0 ); if( !key ) { return std::shared_ptr(); @@ -51,7 +51,7 @@ std::shared_ptr loadPkeyFromFile( const std::string& filename ) { return std::shared_ptr(); } - EVP_PKEY* key = PEM_read_PrivateKey( f.get(), NULL, NULL, 0 ); + EVP_PKEY *key = PEM_read_PrivateKey( f.get(), NULL, NULL, 0 ); if( !key ) { return std::shared_ptr(); @@ -64,7 +64,7 @@ std::shared_ptr loadPkeyFromFile( const std::string& filename ) { } ); } -int gencb( int a, int b, BN_GENCB* g ) { +int gencb( int a, int b, BN_GENCB *g ) { ( void ) a; ( void ) b; ( void ) g; @@ -74,7 +74,7 @@ int gencb( int a, int b, BN_GENCB* g ) { return 1; } -static int verify_callback( int preverify_ok, X509_STORE_CTX* ctx ) { +static int verify_callback( int preverify_ok, X509_STORE_CTX *ctx ) { if( !preverify_ok ) { //auto cert = X509_STORE_CTX_get_current_cert(ctx); //BIO *o = BIO_new_fp(stdout,BIO_NOCLOSE); @@ -200,7 +200,7 @@ CAConfig::CAConfig( const std::string& name ) : path( "ca/" + name ), name( name caKey = loadPkeyFromFile( path + "/ca.key" ); - ASN1_TIME* tm = X509_get_notBefore( ca.get() ); // tm MUST NOT be free'd; duplicate for owning copy. + ASN1_TIME *tm = X509_get_notBefore( ca.get() ); // tm MUST NOT be free'd; duplicate for owning copy. notBefore = std::shared_ptr( ASN1_STRING_dup( tm ), ASN1_TIME_free ); std::size_t pos = name.find( "_" ); @@ -221,7 +221,7 @@ CAConfig::CAConfig( const std::string& name ) : path( "ca/" + name ), name( name std::string timeToString( std::shared_ptr time ) { std::shared_ptr gtime( ASN1_TIME_to_generalizedtime( time.get(), 0 ), ASN1_GENERALIZEDTIME_free ); - std::string strdate( ( char* ) ASN1_STRING_get0_data( gtime.get() ), ASN1_STRING_length( gtime.get() ) ); + std::string strdate( ( char * ) ASN1_STRING_get0_data( gtime.get() ), ASN1_STRING_length( gtime.get() ) ); logger::notef( "openssl formatted me a date: %s", strdate ); @@ -233,8 +233,12 @@ std::string timeToString( std::shared_ptr time ) { } void extractTimes( std::shared_ptr target, std::shared_ptr cert ) { - cert->before = timeToString( std::shared_ptr( X509_get_notBefore( target.get() ), [target](auto p){(void)p;} ) ); - cert->after = timeToString( std::shared_ptr( X509_get_notAfter( target.get() ), [target](auto p){(void)p;} ) ); + cert->before = timeToString( std::shared_ptr( X509_get_notBefore( target.get() ), [target]( auto p ) { + ( void )p; + } ) ); + cert->after = timeToString( std::shared_ptr( X509_get_notAfter( target.get() ), [target]( auto p ) { + ( void )p; + } ) ); } bool CAConfig::crlNeedsResign() { diff --git a/src/io/bios.cpp b/src/io/bios.cpp index 9a1ea57..31f1cb0 100644 --- a/src/io/bios.cpp +++ b/src/io/bios.cpp @@ -4,28 +4,28 @@ namespace BIOWrapper { - int write( BIO* b, const char* buf, int num ) { - return static_cast( b->ptr )->write( buf, num ); + int write( BIO *b, const char *buf, int num ) { + return static_cast( b->ptr )->write( buf, num ); } - int read( BIO* b, char* buf, int size ) { - return static_cast( b->ptr )->read( buf, size ); + int read( BIO *b, char *buf, int size ) { + return static_cast( b->ptr )->read( buf, size ); } - int puts( BIO* b, const char* str ) { - return static_cast( b->ptr )->puts( str ); + int puts( BIO *b, const char *str ) { + return static_cast( b->ptr )->puts( str ); } - int gets( BIO* b, char* str, int size ) { - return static_cast( b->ptr )->gets( str, size ); + int gets( BIO *b, char *str, int size ) { + return static_cast( b->ptr )->gets( str, size ); } - long ctrl( BIO* b, int cmod, long arg1, void* arg2 ) { - return static_cast( b->ptr )->ctrl( cmod, arg1, arg2 ); + long ctrl( BIO *b, int cmod, long arg1, void *arg2 ) { + return static_cast( b->ptr )->ctrl( cmod, arg1, arg2 ); } - int free( BIO* b ) { - delete static_cast( b->ptr ); + int free( BIO *b ) { + delete static_cast( b->ptr ); b->ptr = 0; return 0; } @@ -34,11 +34,11 @@ namespace BIOWrapper { OpensslBIO::~OpensslBIO() {} -int OpensslBIO::puts( const char* str ) { +int OpensslBIO::puts( const char *str ) { ( void ) str; return -1; } -int OpensslBIO::gets( char* str, int size ) { +int OpensslBIO::gets( char *str, int size ) { ( void ) str; ( void ) size; return -1; diff --git a/src/io/bios.h b/src/io/bios.h index 3bbb66b..b866264 100644 --- a/src/io/bios.h +++ b/src/io/bios.h @@ -3,23 +3,23 @@ #include struct bio_st { - const BIO_METHOD *method; - /* bio, mode, argp, argi, argl, ret */ - long (*callback) (struct bio_st *, int, const char *, int, long, long); - char *cb_arg; /* first argument for the callback */ - int init; - int shutdown; - int flags; /* extra storage */ - int retry_reason; - int num; - void *ptr; - struct bio_st *next_bio; /* used by filter BIOs */ - struct bio_st *prev_bio; /* used by filter BIOs */ - int references; - uint64_t num_read; - uint64_t num_write; - CRYPTO_EX_DATA ex_data; - CRYPTO_RWLOCK *lock; + const BIO_METHOD *method; + /* bio, mode, argp, argi, argl, ret */ + long ( *callback )( struct bio_st *, int, const char *, int, long, long ); + char *cb_arg; /* first argument for the callback */ + int init; + int shutdown; + int flags; /* extra storage */ + int retry_reason; + int num; + void *ptr; + struct bio_st *next_bio; /* used by filter BIOs */ + struct bio_st *prev_bio; /* used by filter BIOs */ + int references; + uint64_t num_read; + uint64_t num_write; + CRYPTO_EX_DATA ex_data; + CRYPTO_RWLOCK *lock; }; @@ -30,44 +30,44 @@ public: static const int typeID = BIO_TYPE_CUSTOM; virtual ~OpensslBIO(); - virtual int write( const char* buf, int num ) = 0; - virtual int read( char* buf, int size ) = 0; - virtual int puts( const char* str ); - virtual int gets( char* str, int size ); - virtual long ctrl( int cmod, long arg1, void* arg2 ) = 0; + virtual int write( const char *buf, int num ) = 0; + virtual int read( char *buf, int size ) = 0; + virtual int puts( const char *str ); + virtual int gets( char *str, int size ); + virtual long ctrl( int cmod, long arg1, void *arg2 ) = 0; }; namespace BIOWrapper { - int write( BIO* b, const char* buf, int num ); + int write( BIO *b, const char *buf, int num ); - int read( BIO* b, char* buf, int size ); + int read( BIO *b, char *buf, int size ); - int puts( BIO* b, const char* str ); + int puts( BIO *b, const char *str ); - int gets( BIO* b, char* str, int size ); + int gets( BIO *b, char *str, int size ); - long ctrl( BIO* b, int cmod, long arg1, void* arg2 ); + long ctrl( BIO *b, int cmod, long arg1, void *arg2 ); template - int bio_new( BIO* b ) { + int bio_new( BIO *b ) { b->init = 1; b->num = 0; b->ptr = new T(); return 1; } - int free( BIO* b ); + int free( BIO *b ); } template -BIO_METHOD* toBio() { +BIO_METHOD *toBio() { return toBio( BIOWrapper::bio_new ); } template -BIO_METHOD* toBio( int ( *newfunc )( BIO* ) ) { +BIO_METHOD *toBio( int ( *newfunc )( BIO * ) ) { BIO_METHOD *meth = BIO_meth_new( T::typeID, T::getName() ); BIO_meth_set_write( meth, BIOWrapper::write ); BIO_meth_set_read( meth, BIOWrapper::read ); diff --git a/src/io/opensslBIO.cpp b/src/io/opensslBIO.cpp index 1369960..e175b2c 100644 --- a/src/io/opensslBIO.cpp +++ b/src/io/opensslBIO.cpp @@ -7,27 +7,27 @@ OpensslBIOWrapper::OpensslBIOWrapper( std::shared_ptr _b ) : b( _b ), buffe OpensslBIOWrapper::~OpensslBIOWrapper() { } -int OpensslBIOWrapper::write( const char* buf, int num ) { +int OpensslBIOWrapper::write( const char *buf, int num ) { return BIO_write( b.get(), buf, num ); } -int OpensslBIOWrapper::read( char* buf, int size ) { +int OpensslBIOWrapper::read( char *buf, int size ) { return BIO_read( b.get(), buf, size ); } -long OpensslBIOWrapper::ctrl( int cmod, long arg1, void* arg2 ) { +long OpensslBIOWrapper::ctrl( int cmod, long arg1, void *arg2 ) { return BIO_ctrl( b.get(), cmod, arg1, arg2 ); } -int OpensslBIOWrapper::puts( const char* str ) { +int OpensslBIOWrapper::puts( const char *str ) { return BIO_puts( b.get(), str ); } -int OpensslBIOWrapper::gets( char* str, int size ) { +int OpensslBIOWrapper::gets( char *str, int size ) { return BIO_gets( b.get(), str, size ); } -const char* OpensslBIOWrapper::getName() { +const char *OpensslBIOWrapper::getName() { return "OpenSSLWrapper"; } std::string OpensslBIOWrapper::readLine() { diff --git a/src/io/opensslBIO.h b/src/io/opensslBIO.h index 1cf96f8..46e3642 100644 --- a/src/io/opensslBIO.h +++ b/src/io/opensslBIO.h @@ -14,14 +14,14 @@ public: OpensslBIOWrapper( std::shared_ptr b ); virtual ~OpensslBIOWrapper(); - int write( const char* buf, int num ); - int read( char* buf, int size ); - long ctrl( int cmod, long arg1, void* arg2 ); + int write( const char *buf, int num ); + int read( char *buf, int size ); + long ctrl( int cmod, long arg1, void *arg2 ); - int puts( const char* str ); - int gets( char* str, int size ); + int puts( const char *str ); + int gets( char *str, int size ); - static const char* getName(); + static const char *getName(); std::string readLine(); }; diff --git a/src/io/record.h b/src/io/record.h index 5d6e659..5b9c440 100644 --- a/src/io/record.h +++ b/src/io/record.h @@ -54,7 +54,7 @@ public: template static void append( std::string& str, T val ) { - str.append( ( char* ) &val, sizeof( T ) ); + str.append( ( char * ) &val, sizeof( T ) ); } template diff --git a/src/io/recordHandler.cpp b/src/io/recordHandler.cpp index 2eb8358..8dc105e 100644 --- a/src/io/recordHandler.cpp +++ b/src/io/recordHandler.cpp @@ -34,7 +34,7 @@ public: std::shared_ptr ssl; std::shared_ptr io; - DefaultRecordHandler* parent; + DefaultRecordHandler *parent; std::shared_ptr signer; std::unique_ptr logFile; @@ -43,7 +43,7 @@ public: logger::logger_set logger; - RecordHandlerSession( DefaultRecordHandler* parent, std::shared_ptr signer, std::shared_ptr ctx, std::shared_ptr output ) : + RecordHandlerSession( DefaultRecordHandler *parent, std::shared_ptr signer, std::shared_ptr ctx, std::shared_ptr output ) : tbs( std::make_shared() ), logFile( openLogfile( "logs/log_" + timestamp() ) ), logger{ std::cout, *logFile } { @@ -113,35 +113,33 @@ public: tbs->wishTo = data; break; - case RecordHeader::SignerCommand::ADD_SAN: - { - size_t pos = data.find( "," ); - - if( pos == std::string::npos ) { - // error - } else { - auto san = std::make_shared(); - san->type = data.substr( 0, pos ); - san->content = data.substr( pos + 1 ); - tbs->SANs.push_back( san ); - } - } - break; + case RecordHeader::SignerCommand::ADD_SAN: { + size_t pos = data.find( "," ); - case RecordHeader::SignerCommand::ADD_AVA: - { - size_t pos = data.find( "," ); - - if( pos == std::string::npos ) { - // error - } else { - auto ava = std::make_shared(); - ava->name = data.substr( 0, pos ); - ava->value = data.substr( pos + 1 ); - tbs->AVAs.push_back( ava ); - } + if( pos == std::string::npos ) { + // error + } else { + auto san = std::make_shared(); + san->type = data.substr( 0, pos ); + san->content = data.substr( pos + 1 ); + tbs->SANs.push_back( san ); } - break; + } + break; + + case RecordHeader::SignerCommand::ADD_AVA: { + size_t pos = data.find( "," ); + + if( pos == std::string::npos ) { + // error + } else { + auto ava = std::make_shared(); + ava->name = data.substr( 0, pos ); + ava->value = data.substr( pos + 1 ); + tbs->AVAs.push_back( ava ); + } + } + break; case RecordHeader::SignerCommand::ADD_PROOF_LINE: break; @@ -176,37 +174,37 @@ public: serials.push_back( data ); break; - case RecordHeader::SignerCommand::REVOKE: - { - logger::note("Revoking: ", data); - std::string ca = data; - auto reqCA = CAs.at( ca ); - logger::note( "CA found in recordHandler" ); - std::shared_ptr crl; - std::string date; - std::tie( crl, date ) = signer->revoke( reqCA, serials ); - - respondCommand( RecordHeader::SignerResult::REVOKED, date + crl->getSignature() ); - } - break; + case RecordHeader::SignerCommand::REVOKE: { + logger::note( "Revoking: ", data ); + std::string ca = data; + auto reqCA = CAs.at( ca ); + logger::note( "CA found in recordHandler" ); + std::shared_ptr crl; + std::string date; + std::tie( crl, date ) = signer->revoke( reqCA, serials ); + + respondCommand( RecordHeader::SignerResult::REVOKED, date + crl->getSignature() ); + } + break; + + case RecordHeader::SignerCommand::GET_FULL_CRL: { + logger::note( "Requesting full CRL: ", data ); + auto ca = CAs.at( data ); + CRL c( ca->path + "/ca.crl" ); + respondCommand( RecordHeader::SignerResult::FULL_CRL, c.toString() ); - case RecordHeader::SignerCommand::GET_FULL_CRL: - { - logger::note("Requesting full CRL: ", data); - auto ca = CAs.at( data ); - CRL c( ca->path + "/ca.crl" ); - respondCommand( RecordHeader::SignerResult::FULL_CRL, c.toString() ); - - logger::note( "Shutting down SSL" ); - if( !SSL_shutdown( ssl.get() ) && !SSL_shutdown( ssl.get() ) ) { - logger::error( "ERROR: SSL shutdown failed." ); - } - io->ctrl( BIO_CTRL_FLUSH, 0, NULL ); - logger::note( "Shutted down SSL" ); - - parent->reset(); // Connection ended + logger::note( "Shutting down SSL" ); + + if( !SSL_shutdown( ssl.get() ) && !SSL_shutdown( ssl.get() ) ) { + logger::error( "ERROR: SSL shutdown failed." ); } - break; + + io->ctrl( BIO_CTRL_FLUSH, 0, NULL ); + logger::note( "Shutted down SSL" ); + + parent->reset(); // Connection ended + } + break; default: throw std::runtime_error( "Unimplemented" ); diff --git a/src/io/slipBio.cpp b/src/io/slipBio.cpp index 619159f..8bae55c 100644 --- a/src/io/slipBio.cpp +++ b/src/io/slipBio.cpp @@ -32,7 +32,7 @@ char hexDigit( char c ) { return 'x'; } -std::string toHex( const char* buf, int len ) { +std::string toHex( const char *buf, int len ) { std::string data = "000000"; for( int i = 0; i < len; i++ ) { @@ -57,7 +57,7 @@ SlipBIO::SlipBIO( std::shared_ptr target ) : target( target ), buffe SlipBIO::~SlipBIO() {} -int SlipBIO::write( const char* buf, int num ) { +int SlipBIO::write( const char *buf, int num ) { #ifdef SLIP_IO_DEBUG logger::notef( "slip-out: %s", toHex( buf, num ) ); #endif @@ -77,7 +77,7 @@ int SlipBIO::write( const char* buf, int num ) { } int totalLen = num + badOnes; // 2 - char* targetPtr = ( char* ) malloc( totalLen ); + char *targetPtr = ( char * ) malloc( totalLen ); if( !targetPtr ) { return -1; @@ -129,7 +129,7 @@ int SlipBIO::write( const char* buf, int num ) { return num; } -int SlipBIO::read( char* buf, int size ) { +int SlipBIO::read( char *buf, int size ) { #ifdef UNMASK_DEBUG logger::note( "starting read" ); #endif @@ -222,7 +222,7 @@ int SlipBIO::read( char* buf, int size ) { return len; } -long SlipBIO::ctrl( int cmod, long arg1, void* arg2 ) { +long SlipBIO::ctrl( int cmod, long arg1, void *arg2 ) { ( void ) cmod; ( void ) arg1; ( void ) arg2; @@ -254,7 +254,7 @@ long SlipBIO::ctrl( int cmod, long arg1, void* arg2 ) { return target->ctrl( cmod, arg1, arg2 ); } -const char* SlipBIO::getName() { +const char *SlipBIO::getName() { return "SlipBIO"; } diff --git a/src/io/slipBio.h b/src/io/slipBio.h index 918b9f7..a2fd3c2 100644 --- a/src/io/slipBio.h +++ b/src/io/slipBio.h @@ -34,9 +34,9 @@ public: void setTarget( std::shared_ptr target, bool server ); - virtual int write( const char* buf, int num ); - virtual int read( char* buf, int size ); - virtual long ctrl( int cmod, long arg1, void* arg2 ); + virtual int write( const char *buf, int num ); + virtual int read( char *buf, int size ); + virtual long ctrl( int cmod, long arg1, void *arg2 ); - static const char* getName(); + static const char *getName(); }; diff --git a/src/log/format.cpp b/src/log/format.cpp index 1edd6a0..8f7b36f 100644 --- a/src/log/format.cpp +++ b/src/log/format.cpp @@ -10,7 +10,7 @@ namespace logger { inline namespace literals { - format_data operator"" _fmt( const char* it, std::size_t len ) { + format_data operator"" _fmt( const char *it, std::size_t len ) { const auto end = it + len; auto retval = format_data {}; diff --git a/src/log/format.hpp b/src/log/format.hpp index 827f7ea..5cfd369 100644 --- a/src/log/format.hpp +++ b/src/log/format.hpp @@ -93,19 +93,19 @@ namespace logger { template formated_string fmt( const std::string& str, const Args& ... args ) { auto format = format_data{}; - std::ignore = std::initializer_list{( format.set( args ), 0 )...}; + std::ignore = std::initializer_list {( format.set( args ), 0 )...}; return format( str ); } template formated_integer fmt( const Integer i, const Args& ... args ) { auto format = format_data{}; - std::ignore = std::initializer_list{( format.set( args ), 0 )...}; + std::ignore = std::initializer_list {( format.set( args ), 0 )...}; return format( i ); } inline namespace literals { - format_data operator"" _fmt( const char*, std::size_t ); + format_data operator"" _fmt( const char *, std::size_t ); } } // namespace format @@ -116,10 +116,10 @@ namespace logger { inline std::string to_string( const format::formated_integer& arg ) { std::ostringstream stream; stream << - std::setbase( arg.base ) << - std::setw( arg.width ) << - std::setfill( arg.fill ) << - arg.value; + std::setbase( arg.base ) << + std::setw( arg.width ) << + std::setfill( arg.fill ) << + arg.value; return stream.str(); } diff --git a/src/log/logger.cpp b/src/log/logger.cpp index aee4d29..27ec372 100644 --- a/src/log/logger.cpp +++ b/src/log/logger.cpp @@ -17,8 +17,8 @@ namespace logger { * * CAREFULL: THIS FUNCTION CONTAINS GLOBAL STATE! */ - std::vector& logger_stack() { - static auto stack = std::vector {}; + std::vector& logger_stack() { + static auto stack = std::vector {}; // To avoid infinite recursion, the base-logger must // not auto-register but be added manually static auto std_logger = logger_set {{std::cout}, auto_register::off}; @@ -35,7 +35,7 @@ namespace logger { return stack; } - void reassign_stack_pointer( logger_set*& ptr ) { + void reassign_stack_pointer( logger_set *&ptr ) { const auto old_ptr = ptr; if( ptr ) { @@ -113,7 +113,7 @@ namespace logger { } } - logger_set& logger_set::operator=( logger_set && other ) noexcept { + logger_set& logger_set::operator=( logger_set&& other ) noexcept { if( m_stackpointer ) { *m_stackpointer = nullptr; impl::pop_loggers(); diff --git a/src/log/logger.hpp b/src/log/logger.hpp index aabbb67..4c62d0d 100644 --- a/src/log/logger.hpp +++ b/src/log/logger.hpp @@ -30,7 +30,7 @@ namespace logger { inline std::string to_string( const std::string& arg ) { return arg; } - inline std::string to_string( const char* arg ) { + inline std::string to_string( const char *arg ) { return arg; } @@ -51,13 +51,13 @@ namespace logger { throw std::runtime_error {"logfile not open"}; } } - std::ostream* stream; + std::ostream *stream; level min_level; }; class logger_set; namespace impl { - void reassign_stack_pointer( logger_set*& ptr ); + void reassign_stack_pointer( logger_set *&ptr ); } /** @@ -72,7 +72,7 @@ namespace logger { logger_set( std::initializer_list lst, auto_register = auto_register::on ); logger_set( logger_set&& ) noexcept; - logger_set& operator=( logger_set && ) noexcept; + logger_set& operator=( logger_set&& ) noexcept; ~logger_set(); template @@ -105,13 +105,13 @@ namespace logger { template void fatalf( const std::string& format, Args&& ... args ); - friend void impl::reassign_stack_pointer( logger_set*& ptr ); + friend void impl::reassign_stack_pointer( logger_set *&ptr ); friend logger_set current_logger_extended( std::initializer_list further_targets ); private: void log_impl( level l, const std::string& msg ); std::vector m_loggers; - logger_set** m_stackpointer = nullptr; + logger_set **m_stackpointer = nullptr; level m_min_level; }; diff --git a/src/util.cpp b/src/util.cpp index 55d5864..224613e 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -117,7 +117,7 @@ std::pair parseDate( const std::string& date ) { } std::pair addMonths( std::time_t t, int32_t count ) { - std::tm* parsed = gmtime( &t ); + std::tm *parsed = gmtime( &t ); if( !parsed || count <= 0 || count > 24 ) { // FIXED MAX-Validity-Length return std::pair( false, 0 ); @@ -179,7 +179,7 @@ std::pair parseYearInterval( std::time_t t, const std::string& dat } } -std::unique_ptr openLogfile( const std::string &name ) { +std::unique_ptr openLogfile( const std::string& name ) { struct stat buffer; std::string tname = name; int ctr = 2; diff --git a/src/util.h b/src/util.h index 529820a..766f7ca 100644 --- a/src/util.h +++ b/src/util.h @@ -13,15 +13,15 @@ std::pair parseDate( const std::string& date ); std::pair parseMonthInterval( std::time_t t, const std::string& date ); std::pair parseYearInterval( std::time_t t, const std::string& date ); -std::unique_ptr openLogfile( const std::string &name ); +std::unique_ptr openLogfile( const std::string& name ); #if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ > 8) #else -namespace std{ -template -std::unique_ptr make_unique( Args&&... args ) { - return std::unique_ptr( new T( std::forward(args)... )); -} +namespace std { + template + std::unique_ptr make_unique( Args&& ... args ) { + return std::unique_ptr( new T( std::forward( args )... ) ); + } } #endif diff --git a/test/src/bioWrapper.cpp b/test/src/bioWrapper.cpp index dbf6a6d..9caa379 100644 --- a/test/src/bioWrapper.cpp +++ b/test/src/bioWrapper.cpp @@ -7,33 +7,33 @@ class OpensslBIO1 : public OpensslBIO { public: int state; - int write( const char* buf, int num ); - int read( char* buf, int size ); - long ctrl( int cmod, long arg1, void* arg2 ); + int write( const char *buf, int num ); + int read( char *buf, int size ); + long ctrl( int cmod, long arg1, void *arg2 ); - static const char* getName(); + static const char *getName(); }; -int OpensslBIO1::write( const char* buf, int num ) { +int OpensslBIO1::write( const char *buf, int num ) { state = num * 2; ( void ) buf; return 0; } -int OpensslBIO1::read( char* buf, int size ) { +int OpensslBIO1::read( char *buf, int size ) { state = size * 3; ( void ) buf; return 0; } -long OpensslBIO1::ctrl( int cmod, long arg1, void* arg2 ) { +long OpensslBIO1::ctrl( int cmod, long arg1, void *arg2 ) { state = cmod * 7; ( void ) arg1; ( void ) arg2; return 0; } -const char* OpensslBIO1::getName() { +const char *OpensslBIO1::getName() { return "dummyBIO"; } @@ -42,8 +42,8 @@ BOOST_AUTO_TEST_SUITE( TestBioWrapper ) BOOST_AUTO_TEST_CASE( BasicCalls ) { std::shared_ptr m( toBio(), BIO_meth_free ); std::shared_ptr n( BIO_new( m.get() ), BIO_free ); - OpensslBIO* o = new OpensslBIOWrapper( n ); - OpensslBIO1* data = ( OpensslBIO1* ) n->ptr; + OpensslBIO *o = new OpensslBIOWrapper( n ); + OpensslBIO1 *data = ( OpensslBIO1 * ) n->ptr; o->write( "bla", 13 ); BOOST_CHECK( data->state == 13 * 2 ); diff --git a/test/src/log.cpp b/test/src/log.cpp index c95df53..11bfd92 100644 --- a/test/src/log.cpp +++ b/test/src/log.cpp @@ -11,9 +11,9 @@ BOOST_AUTO_TEST_SUITE( TestLogger ) static inline bool head_and_tail_equal( const std::string& str, const std::string& head, const std::string& tail ) { return str.size() >= head.size() + tail.size() - and std::equal( head.begin(), head.end(), str.begin() ) - and std::equal( tail.rbegin(), tail.rend(), str.rbegin() ) - ; + and std::equal( head.begin(), head.end(), str.begin() ) + and std::equal( tail.rbegin(), tail.rend(), str.rbegin() ) + ; } BOOST_AUTO_TEST_CASE( basic_log ) { diff --git a/test/src/slipBioTest.cpp b/test/src/slipBioTest.cpp index d04a1d6..9147290 100644 --- a/test/src/slipBioTest.cpp +++ b/test/src/slipBioTest.cpp @@ -20,19 +20,19 @@ public: OpensslBIOVector( std::vector> data ) : input( data ), it( input.begin() ), end( input.end() ) { } - int write( const char* buf, int num ); - int read( char* buf, int size ); - long ctrl( int cmod, long arg1, void* arg2 ); + int write( const char *buf, int num ); + int read( char *buf, int size ); + long ctrl( int cmod, long arg1, void *arg2 ); - static const char* getName(); + static const char *getName(); }; -int OpensslBIOVector::write( const char* buf, int num ) { +int OpensslBIOVector::write( const char *buf, int num ) { result.push_back( std::vector( buf, buf + num ) ); return num; } -int OpensslBIOVector::read( char* buf, int size ) { +int OpensslBIOVector::read( char *buf, int size ) { if( it == end ) { return -1; } @@ -47,14 +47,14 @@ int OpensslBIOVector::read( char* buf, int size ) { return result; } -long OpensslBIOVector::ctrl( int cmod, long arg1, void* arg2 ) { +long OpensslBIOVector::ctrl( int cmod, long arg1, void *arg2 ) { ( void ) cmod; ( void ) arg1; ( void ) arg2; return 0; } -const char* OpensslBIOVector::getName() { +const char *OpensslBIOVector::getName() { return "dummyBIO"; } @@ -63,7 +63,7 @@ BOOST_AUTO_TEST_SUITE( TestSLIPBioWrapper ) BOOST_AUTO_TEST_CASE( TestMockup ) { std::vector> source = {{1, 2}, {1, 2, 3}, {1, 2, 3, 4}, {1, 2, 3, 4, 5}}; - OpensslBIOVector* data = new OpensslBIOVector( source ); + OpensslBIOVector *data = new OpensslBIOVector( source ); char buf[4096]; -- 2.39.2