return std::shared_ptr<X509>();
}
- 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<X509>();
return std::shared_ptr<EVP_PKEY>();
}
- 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<EVP_PKEY>();
} );
}
-int gencb( int a, int b, BN_GENCB* g ) {
+int gencb( int a, int b, BN_GENCB *g ) {
( void ) a;
( void ) b;
( void ) 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);
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_new( TLS_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.";
+ throw std::runtime_error( "Cannot set cipher list. Your source is broken." );
}
SSL_CTX_set_verify( ctx.get(), SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, verify_callback );
SSL_CTX_use_PrivateKey_file( ctx.get(), server ? "keys/signer_server.key" : "keys/signer_client.key", SSL_FILETYPE_PEM );
if( 1 != SSL_CTX_load_verify_locations( ctx.get(), "keys/ca.crt", 0 ) ) {
- throw "Cannot load CA store for certificate validation.";
+ throw std::runtime_error( "Cannot load CA store for certificate validation." );
}
if( server ) {
} else {
dh_param = std::shared_ptr<DH>( DH_new(), DH_free );
logger::note( "Generating DH params" );
- BN_GENCB cb;
- cb.ver = 2;
- cb.arg = 0;
- cb.cb.cb_2 = gencb;
+ BN_GENCB *cb = BN_GENCB_new();
+ BN_GENCB_set( cb, gencb, NULL );
- if( !DH_generate_parameters_ex( dh_param.get(), 2048, 5, &cb ) ) {
- throw "DH generation failed";
+ if( !DH_generate_parameters_ex( dh_param.get(), 2048, 5, cb ) ) {
+ throw std::runtime_error( "DH generation failed" );
}
+ BN_GENCB_free( cb );
+
std::cout << std::endl;
paramfile = std::shared_ptr<FILE>( fopen( "dh_param.pem", "w" ), fclose );
}
if( !SSL_CTX_set_tmp_dh( ctx.get(), dh_param.get() ) ) {
- throw "Cannot set tmp dh.";
+ throw std::runtime_error( "Cannot set tmp dh." );
}
}
struct termios attr;
if( tcgetattr( fileno( f.get() ), &attr ) ) {
- throw "failed to get attrs";
+ throw std::runtime_error( "failed to get attrs" );
}
attr.c_iflag &= ~( IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON );
cfsetospeed( &attr, B115200 );
if( tcsetattr( fileno( f.get() ), TCSANOW, &attr ) ) {
- throw "failed to get attrs";
+ throw std::runtime_error( "failed to get attrs" );
}
}
CAConfig::CAConfig( const std::string& name ) : path( "ca/" + name ), name( name ) {
ca = loadX509FromFile( path + "/ca.crt" );
+
+ if( !ca ) {
+ throw new std::invalid_argument( "ca name: " + name + " contains unreadable certificate." );
+ }
+
caKey = loadPkeyFromFile( path + "/ca.key" );
- ASN1_TIME* tm = X509_get_notBefore( ca );
- notBefore = std::shared_ptr<ASN1_TIME>( tm, ASN1_TIME_free );
- std::size_t pos = name.find("_");
- if (pos == std::string::npos) {
- throw new std::invalid_argument("ca name: " + name + " is malformed.");
+
+ ASN1_TIME *tm = X509_get_notBefore( ca.get() ); // tm MUST NOT be free'd; duplicate for owning copy.
+ notBefore = std::shared_ptr<ASN1_TIME>( ASN1_STRING_dup( tm ), ASN1_TIME_free );
+
+ std::size_t pos = name.find( "_" );
+
+ if( pos == std::string::npos ) {
+ throw new std::invalid_argument( "ca name: " + name + " is malformed." );
}
- std::size_t pos2 = name.find("_", pos + 1);
- if (pos2 == std::string::npos) {
- throw new std::invalid_argument("ca name: " + name + " is malformed.");
+
+ std::size_t pos2 = name.find( "_", pos + 1 );
+
+ if( pos2 == std::string::npos ) {
+ throw new std::invalid_argument( "ca name: " + name + " is malformed." );
}
- crlURL = crlPrefix + "/g2/" + name.substr(pos+1, pos2-pos - 1) + "/" + name.substr(0,pos) + "-" + name.substr(pos2+1) + ".crl";
- crtURL = crtPrefix + "/g2/" + name.substr(pos+1, pos2-pos - 1) + "/" + name.substr(0,pos) + "-" + name.substr(pos2+1) + ".crt";
+
+ crlURL = crlPrefix + "/g2/" + name.substr( pos + 1, pos2 - pos - 1 ) + "/" + name.substr( 0, pos ) + "-" + name.substr( pos2 + 1 ) + ".crl";
+ crtURL = crtPrefix + "/g2/" + name.substr( pos + 1, pos2 - pos - 1 ) + "/" + name.substr( 0, pos ) + "-" + name.substr( pos2 + 1 ) + ".crt";
}
std::string timeToString( std::shared_ptr<ASN1_TIME> time ) {
- std::shared_ptr<ASN1_GENERALIZEDTIME> gtime( ASN1_TIME_to_generalizedtime( time.get(), 0 ) );
- std::string strdate( ( char* ) ASN1_STRING_data( gtime.get() ), ASN1_STRING_length( gtime.get() ) );
+ std::shared_ptr<ASN1_GENERALIZEDTIME> 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() ) );
+
+ logger::notef( "openssl formatted me a date: %s", strdate );
- logger::notef("openssl formatted me a date: %s", strdate);
if( strdate[strdate.size() - 1] != 'Z' ) {
- throw "Got invalid date?";
+ throw std::runtime_error( "Got invalid date?" );
}
return strdate.substr( 0, strdate.size() - 1 );
}
void extractTimes( std::shared_ptr<X509> target, std::shared_ptr<SignedCertificate> cert ) {
- cert->before = timeToString( std::shared_ptr<ASN1_TIME>( X509_get_notBefore( target.get() ), ASN1_TIME_free ) );
- cert->after = timeToString( std::shared_ptr<ASN1_TIME>( X509_get_notAfter( target.get() ), ASN1_TIME_free ) );
+ cert->before = timeToString( std::shared_ptr<ASN1_TIME>( X509_get_notBefore( target.get() ), [target]( auto p ) {
+ ( void )p;
+ } ) );
+ cert->after = timeToString( std::shared_ptr<ASN1_TIME>( X509_get_notAfter( target.get() ), [target]( auto p ) {
+ ( void )p;
+ } ) );
}
bool CAConfig::crlNeedsResign() {
projects / cassiopeia.git / blobdiff