X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fcrypto%2FremoteSigner.cpp;h=a8907115dd89b475d222103e0357aa9f757e666b;hb=160ba9d844500d1e553a0dab21a4a2a7fabc60d5;hp=6c003c38023fc2ca2986cbf6d53e6a7cfe153a04;hpb=dacacd128f1a7cde37481857d27cf445833b0489;p=cassiopeia.git diff --git a/src/crypto/remoteSigner.cpp b/src/crypto/remoteSigner.cpp index 6c003c3..a890711 100644 --- a/src/crypto/remoteSigner.cpp +++ b/src/crypto/remoteSigner.cpp @@ -73,7 +73,7 @@ std::shared_ptr RemoteSigner::sign( std::shared_ptrreadLine() ); + std::string payload = parseCommandChunked( head, conn ); switch( static_cast( head.command )) { case RecordHeader::SignerResult::CERTIFICATE: @@ -162,7 +162,7 @@ std::pair, std::string> RemoteSigner::revoke( std::shared_p std::string payload = ca->name; send( conn, head, RecordHeader::SignerCommand::REVOKE, payload ); - payload = parseCommand( head, conn->readLine() ); + payload = parseCommandChunked( head, conn ); std::string tgtName = ca->path + std::string( "/ca.crl" ); auto crl = std::make_shared( tgtName ); @@ -193,7 +193,7 @@ std::pair, std::string> RemoteSigner::revoke( std::shared_p logger::warn( "CRL is broken, trying to recover" ); send( conn, head, RecordHeader::SignerCommand::GET_FULL_CRL, ca->name ); - payload = parseCommand( head, conn->readLine() ); + payload = parseCommandChunked( head, conn ); if( static_cast( head.command ) != RecordHeader::SignerResult::FULL_CRL ) { throw "Protocol violation"; @@ -204,9 +204,8 @@ std::pair, std::string> RemoteSigner::revoke( std::shared_p crl = std::make_shared( name_bak ); if( crl->verify( ca ) ) { - writeFile( tgtName, crl->toString() ); - if( remove( name_bak.c_str() ) != 0 ){ - logger::warn( "Removing old CRL failed" ); + if( rename( name_bak.c_str(), tgtName.c_str() ) != 0 ){ + logger::warn( "Moving new CRL over old CRL failed" ); } logger::note( "CRL is now valid again" ); } else {