crtmgr: clean code and switch -g option to -a

-g option is incoherent with --identifier option it represent. Changed
to -a as plenty of unix tools use it when displaying all information.
Also removed double space and indented a block of code for linting.

Change-Id: I1de7355da1f47b5ea1200d3dd4fe3373091e7403

Author: loulou123546

extras/packaging/gnu-linux/debian/postinst

@@ -8,7 +8,7 @@ create_server_keys() {
     if [ ! -f /etc/dhtnet/id/id-server.crt ] && [ ! -f /etc/dhtnet/id/id-server.pem ]; then
         echo "Generating server keys..."
         dhtnet-crtmgr --setup -o /etc/dhtnet/
-        dhtnet-crtmgr -g -c /etc/dhtnet/id/id-server.crt -p /etc/dhtnet/id/id-server.pem
+        dhtnet-crtmgr -a -c /etc/dhtnet/id/id-server.crt -p /etc/dhtnet/id/id-server.pem
         disable_dnc_service
     fi
 }

tools/dhtnet_crtmgr/README.md

@@ -18,7 +18,7 @@ The DHTNet Certificate Manager is a command-line tool designed to manage certifi
 - `-p, --privatekey`: Provide the path to the private key as an argument.
 - `-c, --certificate`: Provide the path to the certificate  as an argument.
 - `-o, --output`: Provide the path where the generated certificate should be saved as an argument.
-- `-g, --identifier`: Display the user identifier.
+- `-a, --identifier`: Display the user identifier.
 - `-n, --name`: Provide the name of the certificate to be generated.
 - `-s, --setup`: Create an CA and an certificate.
 - `-i, --interactive`: Create certificate using interactive mode.
@@ -38,7 +38,7 @@ dhtnet-crtmgr -o <output> -c <signer_certificate_path> -p <signer_private_key_pa
 
 To display the identifier:
 ```bash
-dhtnet-crtmgr -g <output> -c <certificate_path> -p <private_key_path>
+dhtnet-crtmgr -a -c <certificate_path> -p <private_key_path>
 ```
 
 To generate a CA and an certificate:

tools/dhtnet_crtmgr/main.cpp

@@ -47,7 +47,7 @@ static const constexpr struct option long_options[]
        {"id", required_argument, nullptr, 'o'},
        {"privatekey", required_argument, nullptr, 'p'},
        {"name", required_argument, nullptr, 'n'},
-       {"pkid", no_argument, nullptr, 'g'},
+       {"pkid", no_argument, nullptr, 'a'},
        {"setup", no_argument, nullptr, 's'},
        {"interactive", no_argument, nullptr, 'i'},
        {nullptr, 0, nullptr, 0}};
@@ -57,7 +57,7 @@ parse_args(int argc, char** argv)
 {
     dhtnet_crtmgr_params params;
     int opt;
-    while ((opt = getopt_long(argc, argv, "hgsvi:c:o:p:n:", long_options, nullptr)) != -1) {
+    while ((opt = getopt_long(argc, argv, "hasvi:c:o:p:n:", long_options, nullptr)) != -1) {
         switch (opt) {
         case 'h':
             params.help = true;
@@ -74,7 +74,7 @@ parse_args(int argc, char** argv)
         case 'p':
             params.privatekey = optarg;
             break;
-        case 'g':
+        case 'a':
             params.pkid = true;
             break;
         case 'n':
@@ -197,15 +197,15 @@ main(int argc, char** argv)
     if (params.help) {
         fmt::print("Usage: dhtnet-crtmgr [options]\n"
                 "\nOptions:\n"
-                "  -h, --help            Display this help message and then exit.\n"
-                "  -v, --version         Show the version of the program.\n"
-                "  -p, --privatekey      Provide the path to the private key as an argument.\n"
-                "  -c, --certificate     Provide the path to the certificate  as an argument.\n"
-                "  -o, --output          Provide the path where the generated certificate should be saved as an argument.\n"
-                "  -g, --identifier      Display the user identifier.\n"
-                "  -n, --name            Provide the name of the certificate to be generated.\n"
-                "  -s, --setup           Create an CA and a certificate.\n"
-                "  -i, --interactive     Interactively create and setup identities.\n");
+                "  -h, --help                Display this help message and then exit.\n"
+                "  -v, --version             Show the version of the program.\n"
+                "  -p, --privatekey [PATH]   Provide the path to the private key as an argument.\n"
+                "  -c, --certificate [PATH]  Provide the path to the certificate as an argument.\n"
+                "  -o, --output [FOLDER]     Provide the path where the generated certificate should be saved as an argument.\n"
+                "  -a, --identifier          Display the user identifier.\n"
+                "  -n, --name [NAME]         Provide the name of the certificate to be generated.\n"
+                "  -s, --setup               Create an CA and a certificate.\n"
+                "  -i, --interactive         Interactively create and setup identities.\n");
         return EXIT_SUCCESS;
     }
 
@@ -216,7 +216,7 @@ main(int argc, char** argv)
     // check if the public key id is requested
     if (params.pkid) {
         if (params.ca.empty() || params.privatekey.empty()) {
-            fmt::print(stderr, "Error: The path to the private key and the certificate  is not provided.\n Please specify the path for the private key and the certificate  using the -p and -c options.\n");
+            fmt::print(stderr, "Error: The path to the private key and the certificate is not provided.\n Please specify the path for the private key and the certificate using the -p and -c options.\n");
             exit(EXIT_FAILURE);
         }
         auto identity = dhtnet::loadIdentity(params.privatekey, params.ca);
@@ -362,8 +362,8 @@ main(int argc, char** argv)
             auto ca = dhtnet::generateIdentity(params.id, "ca");
             fmt::print("Generated certificate in {}: {} {}\n", params.id, "ca", ca.second->getId());
         }else{
-        auto ca = dhtnet::generateIdentity(params.id, params.name);
-        fmt::print("Generated certificate in {}: {} {}\n", params.id, params.name, ca.second->getId());
+            auto ca = dhtnet::generateIdentity(params.id, params.name);
+            fmt::print("Generated certificate in {}: {} {}\n", params.id, params.name, ca.second->getId());
         }
     }else{
         auto ca = dhtnet::loadIdentity(params.privatekey, params.ca);

tools/dnc/README.md

@@ -57,11 +57,11 @@ systemctl start dnc.service
 ```
 Obtain the user identifier with the following command:
 ```shell
-dhtnet-crtmgr -g -p <privateKey_path> -c <cert_path>
+dhtnet-crtmgr -a -p <privateKey_path> -c <cert_path>
 ```
 For the server, use:
 ```shell
-dhtnet-crtmgr -g -c /usr/local/etc/dhtnet/id/id-server.crt -p /usr/local/etc/dhtnet/id/id-server.pem
+dhtnet-crtmgr -a -c /usr/local/etc/dhtnet/id/id-server.crt -p /usr/local/etc/dhtnet/id/id-server.pem
 ```
 
 #### Client Connection