From 3ea4de25c712971a35dbad27d8834d75933daa08 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sat, 31 Jan 2015 03:21:07 +0100 Subject: [PATCH] fix: Make CppCheck happy by fixing the code Used CppCheck command: cppcheck --enable=all -v --inconclusive --- src/apps/client.cpp | 6 +++--- src/apps/signer.cpp | 2 +- src/crypto/X509.cpp | 5 ++--- src/crypto/X509.h | 2 +- src/crypto/remoteSigner.cpp | 4 +--- src/crypto/sslUtil.cpp | 10 ++++------ src/crypto/sslUtil.h | 8 ++++---- src/io/bios.cpp | 12 ++++++------ src/io/opensslBIO.cpp | 3 +-- src/io/record.cpp | 2 +- src/io/record.h | 6 +++--- src/io/recordHandler.cpp | 10 ++-------- src/io/slipBio.cpp | 17 ++--------------- 13 files changed, 31 insertions(+), 56 deletions(-) diff --git a/src/apps/client.cpp b/src/apps/client.cpp index e185519..7c5bf08 100644 --- a/src/apps/client.cpp +++ b/src/apps/client.cpp @@ -78,7 +78,7 @@ int main( int argc, const char* argv[] ) { std::shared_ptr jp( new MySQLJobProvider( sqlHost, sqlUser, sqlPass, sqlDB ) ); std::shared_ptr b = openSerial( serialPath ); std::shared_ptr slip1( BIO_new( toBio() ), BIO_free ); - ( ( SlipBIO* )slip1->ptr )->setTarget( std::shared_ptr( new OpensslBIOWrapper( b ) ) ); + static_cast( slip1->ptr )->setTarget( std::shared_ptr( new OpensslBIOWrapper( b ) ) ); std::shared_ptr sign( new RemoteSigner( slip1, generateSSLContext( false ) ) ); // std::shared_ptr sign( new SimpleOpensslSigner() ); @@ -170,7 +170,7 @@ int main( int argc, const char* argv[] ) { continue; } catch( const char* c ) { log << "ERROR: " << c << std::endl; - } catch( std::string c ) { + } catch( std::string& c ) { log << "ERROR: " << c << std::endl; } @@ -178,7 +178,7 @@ int main( int argc, const char* argv[] ) { jp->failJob( job ); } catch( const char* c ) { log << "ERROR: " << c << std::endl; - } catch( std::string c ) { + } catch( std::string& c ) { log << "ERROR: " << c << std::endl; } } else if( job->task == "revoke" ) { diff --git a/src/apps/signer.cpp b/src/apps/signer.cpp index dc9e702..b607b9c 100644 --- a/src/apps/signer.cpp +++ b/src/apps/signer.cpp @@ -46,7 +46,7 @@ int main( int argc, const char* argv[] ) { std::shared_ptr conn = openSerial( serialPath ); std::shared_ptr slip1( BIO_new( toBio() ), BIO_free ); - ( ( SlipBIO* )slip1->ptr )->setTarget( std::shared_ptr( new OpensslBIOWrapper( conn ) ) ); + static_cast( slip1->ptr )->setTarget( std::shared_ptr( new OpensslBIOWrapper( conn ) ) ); DefaultRecordHandler* dh = new DefaultRecordHandler( std::shared_ptr( new SimpleOpensslSigner( ) ), slip1 ); diff --git a/src/crypto/X509.cpp b/src/crypto/X509.cpp index ba39b4b..d340a18 100644 --- a/src/crypto/X509.cpp +++ b/src/crypto/X509.cpp @@ -7,8 +7,7 @@ #include #include -X509Req::X509Req( X509_REQ* csr ) { - req = std::shared_ptr( csr, X509_REQ_free ); +X509Req::X509Req( X509_REQ* csr ) : req( csr, X509_REQ_free ) { EVP_PKEY* pkt = X509_REQ_get_pubkey( req.get() ); if( !pkt ) { @@ -48,7 +47,7 @@ int X509Req::verify() { return X509_REQ_verify( req.get(), pk.get() ); } -std::shared_ptr X509Req::getPkey() { +std::shared_ptr X509Req::getPkey() const { return pk; } diff --git a/src/crypto/X509.h b/src/crypto/X509.h index 0407999..ac0e3d3 100644 --- a/src/crypto/X509.h +++ b/src/crypto/X509.h @@ -19,7 +19,7 @@ public: static std::shared_ptr parseCSR( std::string content ); static std::shared_ptr parseSPKAC( std::string content ); int verify(); - std::shared_ptr getPkey(); + std::shared_ptr getPkey() const; }; class X509Cert { diff --git a/src/crypto/remoteSigner.cpp b/src/crypto/remoteSigner.cpp index b060f6c..b6c7c31 100644 --- a/src/crypto/remoteSigner.cpp +++ b/src/crypto/remoteSigner.cpp @@ -6,9 +6,7 @@ #include #include -RemoteSigner::RemoteSigner( std::shared_ptr target, std::shared_ptr ctx ) { - this->target = target; - this->ctx = ctx; +RemoteSigner::RemoteSigner( std::shared_ptr target, std::shared_ptr ctx ) : target( target ), ctx( ctx ) { } RemoteSigner::~RemoteSigner() { diff --git a/src/crypto/sslUtil.cpp b/src/crypto/sslUtil.cpp index d0710e0..753981c 100644 --- a/src/crypto/sslUtil.cpp +++ b/src/crypto/sslUtil.cpp @@ -17,7 +17,7 @@ std::shared_ptr ssl_lib_ref( CRYPTO_cleanup_all_ex_data(); } ); -std::shared_ptr loadX509FromFile( std::string filename ) { +std::shared_ptr loadX509FromFile( const std::string& filename ) { FILE* f = fopen( filename.c_str(), "r" ); if( !f ) { @@ -38,7 +38,7 @@ std::shared_ptr loadX509FromFile( std::string filename ) { } ); } -std::shared_ptr loadPkeyFromFile( std::string filename ) { +std::shared_ptr loadPkeyFromFile( const std::string& filename ) { FILE* f = fopen( filename.c_str(), "r" ); if( !f ) { @@ -162,7 +162,7 @@ void setupSerial( FILE* f ) { } } -std::shared_ptr openSerial( const std::string name ) { +std::shared_ptr openSerial( const std::string& name ) { FILE* f = fopen( name.c_str(), "r+" ); if( !f ) { @@ -175,9 +175,7 @@ std::shared_ptr openSerial( const std::string name ) { return b; } -CAConfig::CAConfig( std::string name ) { - this->name = name; - this->path = "ca/" + name; +CAConfig::CAConfig( const std::string& name ) : path( "ca/" + name ), name( name ) { ca = loadX509FromFile( path + "/ca.crt" ); caKey = loadPkeyFromFile( path + "/ca.key" ); ASN1_TIME* tm = X509_get_notBefore( ca ); diff --git a/src/crypto/sslUtil.h b/src/crypto/sslUtil.h index c4193fe..1327a17 100644 --- a/src/crypto/sslUtil.h +++ b/src/crypto/sslUtil.h @@ -18,7 +18,7 @@ public: std::shared_ptr ca; std::shared_ptr caKey; std::shared_ptr notBefore; - CAConfig( std::string name ); + CAConfig( const std::string& name ); bool crlNeedsResign(); }; @@ -43,10 +43,10 @@ struct Profile { extern std::shared_ptr ssl_lib_ref; -std::shared_ptr loadX509FromFile( std::string filename ); -std::shared_ptr loadPkeyFromFile( std::string filename ); +std::shared_ptr loadX509FromFile( const std::string& filename ); +std::shared_ptr loadPkeyFromFile( const std::string& filename ); std::shared_ptr generateSSLContext( bool server ); -std::shared_ptr openSerial( const std::string name ); +std::shared_ptr openSerial( const std::string& name ); std::string timeToString( std::shared_ptr time ); void extractTimes( std::shared_ptr source, std::shared_ptr cert ); diff --git a/src/io/bios.cpp b/src/io/bios.cpp index 15d318c..9a1ea57 100644 --- a/src/io/bios.cpp +++ b/src/io/bios.cpp @@ -5,27 +5,27 @@ namespace BIOWrapper { int write( BIO* b, const char* buf, int num ) { - return ( ( OpensslBIO* )b->ptr )->write( buf, num ); + return static_cast( b->ptr )->write( buf, num ); } int read( BIO* b, char* buf, int size ) { - return ( ( OpensslBIO* )b->ptr )->read( buf, size ); + return static_cast( b->ptr )->read( buf, size ); } int puts( BIO* b, const char* str ) { - return ( ( OpensslBIO* )b->ptr )->puts( str ); + return static_cast( b->ptr )->puts( str ); } int gets( BIO* b, char* str, int size ) { - return ( ( OpensslBIO* )b->ptr )->gets( str, size ); + return static_cast( b->ptr )->gets( str, size ); } long ctrl( BIO* b, int cmod, long arg1, void* arg2 ) { - return ( ( OpensslBIO* )b->ptr )->ctrl( cmod, arg1, arg2 ); + return static_cast( b->ptr )->ctrl( cmod, arg1, arg2 ); } int free( BIO* b ) { - delete( ( OpensslBIO* ) b->ptr ); + delete static_cast( b->ptr ); b->ptr = 0; return 0; } diff --git a/src/io/opensslBIO.cpp b/src/io/opensslBIO.cpp index 3562822..03122db 100644 --- a/src/io/opensslBIO.cpp +++ b/src/io/opensslBIO.cpp @@ -1,7 +1,6 @@ #include "opensslBIO.h" -OpensslBIOWrapper::OpensslBIOWrapper( std::shared_ptr b ) { - this->b = b; +OpensslBIOWrapper::OpensslBIOWrapper( std::shared_ptr b ) : b( b ) { } OpensslBIOWrapper::~OpensslBIOWrapper() { diff --git a/src/io/record.cpp b/src/io/record.cpp index 8f81d02..bd0cc1b 100644 --- a/src/io/record.cpp +++ b/src/io/record.cpp @@ -52,7 +52,7 @@ int32_t fromHexDigit( char c ) { return res; } -std::string parseCommand( RecordHeader& head, const std::string input, std::shared_ptr log ) { +std::string parseCommand( RecordHeader& head, const std::string& input, std::shared_ptr log ) { if( log ) { ( *log.get() ) << "FINE: RECORD input: " << input << std::endl; } diff --git a/src/io/record.h b/src/io/record.h index ba5a8d8..29c05ca 100644 --- a/src/io/record.h +++ b/src/io/record.h @@ -52,12 +52,12 @@ public: } template - void append( std::string& str, T val ) { + static void append( std::string& str, T val ) { str.append( ( char* ) &val, sizeof( T ) ); } template - void read( std::string::iterator& it, T& val ) { + static void read( std::string::iterator& it, T& val ) { char* data = ( char* ) &val; for( size_t i = 0; i < sizeof( T ); i++ ) { @@ -96,6 +96,6 @@ public: }; -std::string parseCommand( RecordHeader& head, const std::string input, std::shared_ptr log ); +std::string parseCommand( RecordHeader& head, const std::string& input, std::shared_ptr log ); void sendCommand( RecordHeader& head, const std::string& data, std::shared_ptr bio, std::shared_ptr log ); diff --git a/src/io/recordHandler.cpp b/src/io/recordHandler.cpp index 2ba71c2..c46c845 100644 --- a/src/io/recordHandler.cpp +++ b/src/io/recordHandler.cpp @@ -221,14 +221,8 @@ public: } }; -DefaultRecordHandler::DefaultRecordHandler( std::shared_ptr signer, std::shared_ptr bio ) : - currentSession() { - - this->signer = signer; - - ctx = generateSSLContext( true ); - - this->bio = bio; +DefaultRecordHandler::DefaultRecordHandler( std::shared_ptr signer, std::shared_ptr bio ) + : bio( bio ), ctx( generateSSLContext( true ) ), signer( signer ), currentSession() { } void DefaultRecordHandler::reset() { diff --git a/src/io/slipBio.cpp b/src/io/slipBio.cpp index 1a7ba04..fb3f6c1 100644 --- a/src/io/slipBio.cpp +++ b/src/io/slipBio.cpp @@ -37,27 +37,14 @@ std::string toHex( const char* buf, int len ) { return data; } -SlipBIO::SlipBIO() { - this->buffer = std::vector( BUFFER_SIZE ); - this->decodeTarget = 0; - this->decodePos = 0; - this->rawPos = 0; - this->failed = false; +SlipBIO::SlipBIO() : buffer( std::vector( BUFFER_SIZE ) ), decodeTarget( 0 ), decodePos( 0 ), rawPos( 0 ), failed( false ) { } void SlipBIO::setTarget( std::shared_ptr target ) { this->target = target; } -SlipBIO::SlipBIO( std::shared_ptr target ) { - this->target = target; - - this->buffer = std::vector( BUFFER_SIZE ); - this->decodeTarget = 0; - this->decodePos = 0; - this->rawPos = 0; - - this->failed = false; +SlipBIO::SlipBIO( std::shared_ptr target ) : target( target ), buffer( std::vector( BUFFER_SIZE ) ), decodeTarget( 0 ), decodePos( 0 ), rawPos( 0 ), failed( false ) { } SlipBIO::~SlipBIO() {} -- 2.39.2