alex.kopachov vor 2 Jahren
Ursprung
Commit
0a424a5af5
2 geänderte Dateien mit 22 neuen und 9 gelöschten Zeilen
  1. 21 8
      cli/commands/add/add.c
  2. 1 1
      types/token_info.c

+ 21 - 8
cli/commands/add/add.c

@@ -107,10 +107,17 @@ void totp_cli_command_add_docopt_options() {
                                         ", " TOTP_TOKEN_ALGO_SHA512_NAME
                                         ", " TOTP_TOKEN_ALGO_STEAM_NAME
                                         " " DOCOPT_DEFAULT(TOTP_TOKEN_ALGO_SHA1_NAME) "\r\n");
-    TOTP_CLI_PRINTF("  " DOCOPT_OPTION(
-        TOTP_CLI_COMMAND_ARG_DIGITS_PREFIX,
-        DOCOPT_ARGUMENT(
-            TOTP_CLI_COMMAND_ARG_DIGITS)) "    Number of digits to generate, one of: %" PRIu8 ", %" PRIu8 ", %" PRIu8 " " DOCOPT_DEFAULT("%" PRIu8) "\r\n", TotpFiveDigitsCount, TotpSixDigitsCount, TotpEightDigitsCount, TotpSixDigitsCount);
+    TOTP_CLI_PRINTF(
+        "  " DOCOPT_OPTION(
+            TOTP_CLI_COMMAND_ARG_DIGITS_PREFIX,
+            DOCOPT_ARGUMENT(
+                TOTP_CLI_COMMAND_ARG_DIGITS)) "    Number of digits to generate, one of: %" PRIu8
+                                              ", %" PRIu8 ", %" PRIu8
+                                              " " DOCOPT_DEFAULT("%" PRIu8) "\r\n",
+        TotpFiveDigitsCount,
+        TotpSixDigitsCount,
+        TotpEightDigitsCount,
+        TotpSixDigitsCount);
 
     TOTP_CLI_PRINTF("  " DOCOPT_OPTION(
         TOTP_CLI_COMMAND_ARG_SECRET_ENCODING_PREFIX,
@@ -120,10 +127,16 @@ void totp_cli_command_add_docopt_options() {
                                                    " " DOCOPT_DEFAULT(
                                                        PLAIN_TOKEN_ENCODING_BASE32_NAME) "\r\n");
 
-    TOTP_CLI_PRINTF("  " DOCOPT_OPTION(
-        TOTP_CLI_COMMAND_ARG_DURATION_PREFIX,
-        DOCOPT_ARGUMENT(
-            TOTP_CLI_COMMAND_ARG_DURATION)) "  Token lifetime duration in seconds, between: %" PRIu8 " and %" PRIu8 " " DOCOPT_DEFAULT("%" PRIu8) "\r\n", TOTP_TOKEN_DURATION_MIN, TOTP_TOKEN_DURATION_MAX, TOTP_TOKEN_DURATION_DEFAULT);
+    TOTP_CLI_PRINTF(
+        "  " DOCOPT_OPTION(
+            TOTP_CLI_COMMAND_ARG_DURATION_PREFIX,
+            DOCOPT_ARGUMENT(
+                TOTP_CLI_COMMAND_ARG_DURATION)) "  Token lifetime duration in seconds, between: %" PRIu8
+                                                " and %" PRIu8
+                                                " " DOCOPT_DEFAULT("%" PRIu8) "\r\n",
+        TOTP_TOKEN_DURATION_MIN,
+        TOTP_TOKEN_DURATION_MAX,
+        TOTP_TOKEN_DURATION_DEFAULT);
     TOTP_CLI_PRINTF("  " DOCOPT_SWITCH(
         TOTP_CLI_COMMAND_ARG_UNSECURE_PREFIX) "             Show console user input as-is without masking\r\n");
     TOTP_CLI_PRINTF("  " DOCOPT_OPTION(

+ 1 - 1
types/token_info.c

@@ -87,7 +87,7 @@ bool token_info_set_digits_from_int(TokenInfo* token_info, uint8_t digits) {
 bool token_info_set_duration_from_int(TokenInfo* token_info, uint8_t duration) {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wtype-limits"
-    if(duration >= TOTP_TOKEN_DURATION_MIN && duration <= TOTP_TOKEN_DURATION_MAX) {
+    if(duration >= TOTP_TOKEN_DURATION_MIN && duration <= TOTP_TOKEN_DURATION_MAX) { //-V560
         token_info->duration = duration;
         return true;
     }