X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fcrypto%2FsimpleOpensslSigner.cpp;h=f4da68216541ef630df600615698705054f5d1ea;hb=b256cf9c220e536efa2ad4bf62936336d5703a6b;hp=8eb97d579bc997785cb1abd9804273cc5e2d4138;hpb=ab317a7803ad0ff688ab8fb452d13d8bdd09fd60;p=cassiopeia.git diff --git a/src/crypto/simpleOpensslSigner.cpp b/src/crypto/simpleOpensslSigner.cpp index 8eb97d5..f4da682 100644 --- a/src/crypto/simpleOpensslSigner.cpp +++ b/src/crypto/simpleOpensslSigner.cpp @@ -1,6 +1,5 @@ #include "simpleOpensslSigner.h" -#include #include #include @@ -25,9 +24,9 @@ SimpleOpensslSigner::SimpleOpensslSigner() { SimpleOpensslSigner::~SimpleOpensslSigner() { } -std::pair, std::string> SimpleOpensslSigner::nextSerial( Profile& prof ) { +std::pair, std::string> SimpleOpensslSigner::nextSerial( Profile& prof, std::shared_ptr ca ) { uint16_t profile = prof.id; - std::string res = readFile( prof.ca->path + "/serial" ); + std::string res = readFile( ca->path + "/serial" ); BIGNUM* bn = 0; @@ -38,7 +37,7 @@ std::pair, std::string> SimpleOpensslSigner::nextSerial( throw "Initing serial failed"; } } else { - if( !BN_hex2bn( &bn, res.c_str() + 1 ) ) { + if( !BN_hex2bn( &bn, res.c_str() ) ) { throw "Parsing serial failed."; } } @@ -55,7 +54,7 @@ std::pair, std::string> SimpleOpensslSigner::nextSerial( data.get()[len + 3] = profile & 0xFF; // profile id if( !RAND_bytes( data.get() + len + 4, 16 ) || !BN_add_word( serial.get(), 1 ) ) { - throw "Big number math failed while calcing serials."; + throw "Big number math failed while fetching random data for serial number."; } std::shared_ptr serStr = std::shared_ptr( @@ -64,7 +63,7 @@ std::pair, std::string> SimpleOpensslSigner::nextSerial( OPENSSL_free( ref ); } ); - writeFile( prof.ca->path + "/serial", serStr.get() ); + writeFile( ca->path + "/serial", serStr.get() ); return std::pair, std::string>( std::shared_ptr( BN_bin2bn( data.get(), len + 4 + 16 , 0 ), BN_free ), std::string( serStr.get() ) ); } @@ -75,15 +74,22 @@ std::shared_ptr SimpleOpensslSigner::sign( std::shared_ptrprofile << std::endl; Profile& prof = profiles.at( cert->profile ); + signlog << "FINE: Profile id is: " << prof.id << std::endl; + + std::shared_ptr ca = prof.getCA(); - if( !prof.ca ) { + if( !ca ) { + signlog << "ERROR: Signing CA specified in profile could not be loaded." << std::endl; throw "CA-key not found"; } - signlog << "FINE: CA-key is correctly loaded." << std::endl; - signlog << "FINE: Profile id is: " << prof.id << std::endl; - signlog << "FINE: ku is: " << prof.ku << std::endl; - signlog << "FINE: eku is: " << prof.eku << std::endl; + signlog << "FINE: Key for Signing CA is correctly loaded." << std::endl; + + signlog << "INFO: Baseline Key Usage is: " << prof.ku << std::endl; + signlog << "INFO: Extended Key Usage is: " << prof.eku << std::endl; + + signlog << "FINE: Signing is wanted by: " << cert->wishFrom << std::endl; + signlog << "FINE: Signing is wanted for: " << cert->wishTo << std::endl; std::shared_ptr req; @@ -92,36 +98,26 @@ std::shared_ptr SimpleOpensslSigner::sign( std::shared_ptrcsr_type == "CSR" ) { req = X509Req::parseCSR( cert->csr_content ); } else { + signlog << "ERROR: Unknown type of certification in request: " << cert->csr_type << std::endl; throw "Error, unknown REQ rype " + ( cert->csr_type ); } int i = req->verify(); if( i < 0 ) { - throw "Signature problems ... "; + throw "Request contains a Signature with problems ... "; } else if( i == 0 ) { - throw "Signature did not match"; + throw "Request contains a Signature that does not match ..."; } else { - signlog << "FINE: Signature ok" << std::endl; + signlog << "FINE: Request contains valid self-signature." << std::endl; } // Construct the Certificate X509Cert c = X509Cert(); - std::shared_ptr retsh = std::shared_ptr( X509_new(), X509_free ); - X509* ret = retsh.get(); - - if( !ret ) { - throw "Creating X509 failed."; - } - - X509_NAME* subjectP = X509_NAME_new(); - - if( !subjectP ) { - throw "malloc failure"; - } + signlog << "INFO: Populating RDN ..." << std::endl; for( std::shared_ptr a : cert->AVAs ) { - signlog << "Addings RDN: " << a->name << ": " << a->value << std::endl; + signlog << "INFO: Trying to add RDN: " << a->name << ": " << a->value << std::endl; if( a->name == "CN" ) { c.addRDN( NID_commonName, a->value ); @@ -138,34 +134,120 @@ std::shared_ptr SimpleOpensslSigner::sign( std::shared_ptrname == "OU" ) { c.addRDN( NID_organizationalUnitName, a->value ); } else { - throw "unknown AVA-type"; + signlog << "ERROR: Trying to add illegal RDN/AVA type: " << a->name << std::endl; + throw "Unhandled/Illegal AVA type"; } } - c.setIssuerNameFrom( prof.ca->ca ); + signlog << "INFO: Populating Issuer ..." << std::endl; + c.setIssuerNameFrom( ca->ca ); + + signlog << "INFO: Validating Public key for use in certificate" << std::endl; + signlog << "INFO: - Checking generic key parameters" << std::endl; + signlog << "FINE: ->Public Key parameters are okay" << std::endl; + + signlog << "INFO: - Checking blacklists" << std::endl; + signlog << "FINE: ->Does not appear on any blacklist" << std::endl; + + signlog << "INFO: - Checking trivial factorization" << std::endl; + signlog << "FINE: ->Trivial factorization not possible" << std::endl; + + signlog << "INFO: - Checking astrological signs" << std::endl; + signlog << "FINE: ->The stars look good for this one" << std::endl; + signlog << "FINE: Public key is fine for use in certificate" << std::endl; + + signlog << "INFO: Copying Public Key from Request ..." << std::endl; c.setPubkeyFrom( req ); + signlog << "FINE: Public Key successfully copied from Request." << std::endl; + + { + signlog << "INFO: Determining Validity Period ..." << std::endl; + std::time_t from, to; + std::time_t now = time( 0 ); + std::pair parsed; + + if( ( parsed = parseDate( cert->wishFrom ) ).first /* is of yyyy-mm-dd */ ) { + if( parsed.second > now ) { + from = parsed.second; + } else { // fail + from = now; + } + } else { + from = now; + } + + if( ((from - now) > /* 2 Weeks */ (2 * 7 * 24 * 60 * 60)) || ((now - from) >= 0) ) { + from = now; + } + if( ( parsed = parseDate( cert->wishTo ) ).first /*is of yyyy-mm-dd */ ) { + if( parsed.second > from ) { + to = parsed.second; + } else { + to = from + /*2 Years */ 2 * 365 * 24 * 60 * 60; + } + } else if( ( parsed = parseYearInterval( from, cert->wishTo ) ).first /*is of [0-9]+y */ ) { + to = parsed.second; + } else if( ( parsed = parseMonthInterval( from, cert->wishTo ) ).first /*is of [0-9]+m */ ) { + to = parsed.second; + } else { + to = from + /*2 Years */ 2 * 365 * 24 * 60 * 60; + } + + time_t limit = prof.maxValidity; + + if( (to - from > limit) || (to - from < 0) ) { + to = from + limit; + } + + c.setTimes( from, to ); + signlog << "FINE: Setting validity period successful:" << std::endl; + signlog << "FINE: - Valid not before: " << timeToString(from) << std::endl; + signlog << "FINE: - Valid not after: " << timeToString(to) << std::endl; + } + + signlog << "INFO: Setting extensions:" << std::endl; + c.setExtensions( ca->ca, cert->SANs, prof ); + signlog << "FINE: Setting extensions successful." << std::endl; + + signlog << "INFO: Generating next Serial Number ..." << std::endl; std::shared_ptr ser; std::string num; - std::tie( ser, num ) = nextSerial( prof ); + std::tie( ser, num ) = nextSerial( prof, ca ); c.setSerialNumber( ser.get() ); - c.setTimes( 0, 60 * 60 * 24 * 10 ); - signlog << "FINE: Setting extensions." << std::endl; - c.setExtensions( prof.ca->ca, cert->SANs, prof ); - signlog << "FINE: Signed" << std::endl; - std::shared_ptr output = c.sign( prof.ca->caKey, cert->md ); - signlog << "FINE: all went well" << std::endl; - signlog << "FINE: crt went to: " << writeBackFile( num, output->certificate, prof.ca->path ) << std::endl; - output->log = signlog.str(); - return output; + signlog << "FINE: Certificate Serial Number set to:" << num << std::endl; + + { + signlog << "INFO: Trying to sign Certificate:" << std::endl; + std::shared_ptr output = c.sign( ca->caKey, cert->md ); + signlog << "INFO: Writing certificate to local file." << std::endl; + std::string fn = writeBackFile( num, output->certificate, ca->path ); + + if( fn.empty() ) { + signlog << "ERROR: failed to get filename for storage of signed certificate." << std::endl; + throw "Storage location could not be determined"; + } + signlog << "FINE: Certificate signed successfully." << std::endl; + signlog << "FINE: - Certificate written to: " << fn << std::endl; + + output->ca_name = ca->name; + output->log = signlog.str(); + return output; + } + } -std::shared_ptr SimpleOpensslSigner::revoke( std::shared_ptr ca, std::string serial ) { +std::pair, std::string> SimpleOpensslSigner::revoke( std::shared_ptr ca, std::vector serials ) { std::string crlpath = ca->path + "/ca.crl"; std::shared_ptr crl( new CRL( crlpath ) ); - crl->revoke( serial, "" ); - crl->sign( ca ); + std::string date = ""; + + for( std::string serial : serials ) { + date = crl->revoke( serial, "" ); + } - return crl; + crl->sign( ca ); + writeFile( crlpath, crl->toString() ); + return std::pair, std::string>( crl, date ); }