From 23987db96db7962a6ee58d1aeda2bd87780ca579 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 9 Apr 2017 17:15:51 +0000 Subject: [PATCH] fix: check cert before operating on it Change-Id: I61c13d2e0e9c62d0833fff08b05bc4ded31ada98 --- src/apps/client.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/apps/client.cpp b/src/apps/client.cpp index c3a0115..ceb2677 100644 --- a/src/apps/client.cpp +++ b/src/apps/client.cpp @@ -140,6 +140,12 @@ int main( int argc, const char* argv[] ) { if( job->task == "sign" ) { try { std::shared_ptr cert = jp->fetchTBSCert( job ); + if( !cert ) { + logger::error( "Unable to load CSR" ); + jp->failJob( job ); + continue; + } + cert->wishFrom = job->from; cert->wishTo = job->to; logger::note( "INFO: Message Digest: ", cert->md ); @@ -153,12 +159,6 @@ int main( int argc, const char* argv[] ) { logger::notef( "INFO: AVA %s: %s", AVA->name, AVA->value ); } - if( !cert ) { - logger::error( "Unable to load CSR" ); - jp->failJob( job ); - continue; - } - logger::notef( "FINE: Found the CSR at '%s'", cert->csr ); cert->csr_content = readFile( keyDir + "/../" + cert->csr ); logger::note( "FINE: CSR content:\n", cert->csr_content ); -- 2.39.2