CRYPTO_cleanup_all_ex_data();
} );
-std::shared_ptr<X509> loadX509FromFile( std::string filename ) {
- FILE* f = fopen( filename.c_str(), "r" );
+std::shared_ptr<X509> loadX509FromFile( const std::string& filename ) {
+ std::shared_ptr<FILE> f( fopen( filename.c_str(), "r" ), fclose );
if( !f ) {
return std::shared_ptr<X509>();
}
- X509* key = PEM_read_X509( f, NULL, NULL, 0 );
- fclose( f );
+ X509* key = PEM_read_X509( f.get(), NULL, NULL, 0 );
if( !key ) {
return std::shared_ptr<X509>();
} );
}
-std::shared_ptr<EVP_PKEY> loadPkeyFromFile( std::string filename ) {
- FILE* f = fopen( filename.c_str(), "r" );
+std::shared_ptr<EVP_PKEY> loadPkeyFromFile( const std::string& filename ) {
+ std::shared_ptr<FILE> f( fopen( filename.c_str(), "r" ), fclose );
if( !f ) {
return std::shared_ptr<EVP_PKEY>();
}
- EVP_PKEY* key = PEM_read_PrivateKey( f, NULL, NULL, 0 );
- fclose( f );
+ EVP_PKEY* key = PEM_read_PrivateKey( f.get(), NULL, NULL, 0 );
if( !key ) {
return std::shared_ptr<EVP_PKEY>();
SSL_CTX_set_verify( ctx.get(), SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, verify_callback );
SSL_CTX_use_certificate_file( ctx.get(), server ? "keys/signer_server.crt" : "keys/signer_client.crt", SSL_FILETYPE_PEM );
SSL_CTX_use_PrivateKey_file( ctx.get(), server ? "keys/signer_server.key" : "keys/signer_client.key", SSL_FILETYPE_PEM );
- SSL_CTX_load_verify_locations( ctx.get(), "keys/ca.crt", 0 );
+ if( 1 != SSL_CTX_load_verify_locations( ctx.get(), "keys/ca.crt", 0 ) ) {
+ throw "Cannot load CA store for certificate validation.";
+ }
if( server ) {
STACK_OF( X509_NAME ) *names = SSL_load_client_CA_file( "keys/env.crt" );
}
if( !dh_param ) {
- FILE* paramfile = fopen( "dh_param.pem", "r" );
+ std::shared_ptr<FILE> paramfile( fopen( "dh_param.pem", "r" ), fclose );
if( paramfile ) {
- dh_param = std::shared_ptr<DH>( PEM_read_DHparams( paramfile, NULL, NULL, NULL ), DH_free );
- fclose( paramfile );
+ 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;
}
std::cout << std::endl;
- paramfile = fopen( "dh_param.pem", "w" );
+ paramfile = std::shared_ptr<FILE>( fopen( "dh_param.pem", "w" ), fclose );
if( paramfile ) {
- PEM_write_DHparams( paramfile, dh_param.get() );
- fclose( paramfile );
+ PEM_write_DHparams( paramfile.get(), dh_param.get() );
}
}
}
return ctx;
}
-void setupSerial( FILE* f ) {
+void setupSerial( std::shared_ptr<FILE> f ) {
struct termios attr;
- if( tcgetattr( fileno( f ), &attr ) ) {
+ if( tcgetattr( fileno( f.get() ), &attr ) ) {
throw "failed to get attrs";
}
cfsetispeed( &attr, B115200 );
cfsetospeed( &attr, B115200 );
- if( tcsetattr( fileno( f ), TCSANOW, &attr ) ) {
+ if( tcsetattr( fileno( f.get() ), TCSANOW, &attr ) ) {
throw "failed to get attrs";
}
}
-std::shared_ptr<BIO> openSerial( const std::string name ) {
- FILE* f = fopen( name.c_str(), "r+" );
+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;
}
setupSerial( f );
- std::shared_ptr<BIO> b( BIO_new_fd( fileno( f ), 0 ), BIO_free );
- return b;
+ return std::shared_ptr<BIO>(
+ BIO_new_fd( fileno( f.get() ), 0 ),
+ [f]( BIO* b ) {
+ BIO_free(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 );