fix: Fix memory-leak in CRL.cpp, revocation from DB, multiple CAs

[cassiopeia.git] / src / apps / client.cpp

diff --git a/src/apps/client.cpp b/src/apps/client.cpp
index 9e85c95e598a4e7c7bb7037898440a2cc29b1848..1793de0027177b6a79e84598d88e92b4a24f02fa 100644 (file)
--- a/src/apps/client.cpp
+++ b/src/apps/client.cpp
@@ -6,14 +6,14 @@
 #include <streambuf>
 #include <unordered_map>
 
-#include "database.h"
-#include "mysql.h"
-#include "simpleOpensslSigner.h"
+#include "db/database.h"
+#include "db/mysql.h"
+#include "crypto/simpleOpensslSigner.h"
+#include "crypto/remoteSigner.h"
+#include "crypto/sslUtil.h"
 #include "util.h"
-#include "bios.h"
-#include "slipBio.h"
-#include "remoteSigner.h"
-#include "sslUtil.h"
+#include "io/bios.h"
+#include "io/slipBio.h"
 #include "config.h"
 
 #ifdef NO_DAEMON
@@ -148,8 +148,13 @@ int main( int argc, const char* argv[] ) {
                 std::cout << " [" << x.first << ']' << std::endl;
             }
 
-            sign->revoke( CAs.at( "unassured" ), "12345" );
-            jp->finishJob( job );
+            try {
+                auto data = jp->getRevocationInfo( job );
+                sign->revoke( CAs.at( data.second ), data.first );
+                jp->finishJob( job );
+            } catch( const char* c ) {
+                std::cout << "Exception: " << c << std::endl;
+            }
         } else {
             log << "Unknown job type" << job->task << std::endl;
             jp->failJob( job );