add -V switch to get tool version

diff --git a/ykchalresp.1 b/ykchalresp.1
index 5cb261c09b21b8696f7f517d67a86affacc89ed4..f959fc3cd0982b5b8d8e9487738514a0f4331586 100644 (file)
--- a/ykchalresp.1
+++ b/ykchalresp.1
@@ -35,7 +35,7 @@
 ykchalresp - Perform challenge-response operation with YubiKey
 .SH SYNOPSIS
 .B ykchalresp
-[\fI-1\fR | \fI-2\fR] [\fI-H\fR] [\fI-Y\fR] [\fI-N\fR] [\fI-x\fR] [\fI-v\fR] [\fI-h\fR]
+[\fI-1\fR | \fI-2\fR] [\fI-H\fR] [\fI-Y\fR] [\fI-N\fR] [\fI-x\fR] [\fI-v\fR] [\fI-V\fR] [\fI-h\fR]
 .SH DESCRIPTION
 .PP
 Send a challenge to a YubiKey, and read the response.  The YubiKey can be configured
@@ -65,6 +65,9 @@ challenge is hex encoded.
 .TP
 \fB\-v\fR
 enable verbose mode.
+.TP
+\fB\-V\fR
+print tool version and exit.
 
 .SH EXAMPLE
 The YubiKey challenge-response operation can be demonstrated using the

diff --git a/ykchalresp.c b/ykchalresp.c
index 9577b36ef2cbdf0775f4b4becb98b8ccc8593bcf..fdeeb4babed0592b2f5df208593f4c6d8f8bd45a 100644 (file)
--- a/ykchalresp.c
+++ b/ykchalresp.c
@@ -39,6 +39,7 @@
 #include <ykdef.h>
 #include <ykcore.h>
 #include <ykstatus.h>
+#include <ykpers-version.h>
 
 const char *usage =
        "Usage: ykchalresp [options] challenge\n"
@@ -53,11 +54,12 @@ const char *usage =
        "\t-x        Challenge is hex encoded.\n"
        "\n"
        "\t-v        verbose\n"
+       "\t-V        tool version\n"
        "\t-h        help (this text)\n"
        "\n"
        "\n"
        ;
-const char *optstring = "12xvhHYN";
+const char *optstring = "12xvhHYNV";
 
 static void report_yk_error(void)
 {
@@ -104,6 +106,10 @@ static int parse_args(int argc, char **argv,
                case 'v':
                        *verbose = true;
                        break;
+               case 'V':
+                       fputs(YKPERS_VERSION_STRING "\n", stderr);
+                       *exit_code = 0;
+                       return 0;
                case 'h':
                default:
                        fputs(usage, stderr);

diff --git a/ykinfo.1 b/ykinfo.1
index f9804a8d62a4a23d6015df77a3e478edc92d03ef..dacd5b3aebaf71e272b23b83bf185535eafa6bbb 100644 (file)
--- a/ykinfo.1
+++ b/ykinfo.1
@@ -35,7 +35,7 @@
 ykinfo - Get basic information from a YubiKey
 .SH SYNOPSIS
 .B ykinfo
-[\fI-s\fR] [\fI-m\fR] [\fI-H\fR] [\fI-v\fR] [\fI-t\fR] [\fI-p\fR] [\fI-q\fR] [\fI-h\fR]
+[\fI-s\fR] [\fI-m\fR] [\fI-H\fR] [\fI-v\fR] [\fI-t\fR] [\fI-p\fR] [\fI-q\fR] [\fI-V\fR] [\fI-h\fR]
 .SH DESCRIPTION
 .PP
 Get basic information from a YubiKey. Can get serial number, version
@@ -68,6 +68,8 @@ get all the information above.
 \fB\-q\fR
 modifier, only show the relevant data from the YubiKey, no extra information.
 .TP
+\fB\-V\fR
+print tool version and exit
 
 .SH EXAMPLE
 Output of all information from a YubiKey

diff --git a/ykinfo.c b/ykinfo.c
index dc846fa1e3b158643275ec16bbefcdc0bf7594bd..0015e7ffe61a36cf1a0f22dac2f2df20ec9f1384 100644 (file)
--- a/ykinfo.c
+++ b/ykinfo.c
@@ -37,6 +37,7 @@
 #include <yubikey.h>
 #include <ykcore.h>
 #include <ykstatus.h>
+#include <ykpers-version.h>
 
 const char *usage =
        "Usage: ykinfo [options]\n"
@@ -53,11 +54,12 @@ const char *usage =
        "\n"
        "\t-q        Only output information from YubiKey\n"
        "\n"
+       "\t-V        Get the tool version\n"
        "\t-h        help (this text)\n"
        "\n"
        "\n"
        ;
-const char *optstring = "asmHvtpqh";
+const char *optstring = "asmHvtpqhV";
 
 static void report_yk_error(void)
 {
@@ -110,6 +112,10 @@ static int parse_args(int argc, char **argv,
                case 'q':
                        *quiet = true;
                        break;
+               case 'V':
+                       fputs(YKPERS_VERSION_STRING "\n", stderr);
+                       *exit_code = 0;
+                       return 0;
                case 'h':
                default:
                        fputs(usage, stderr);

diff --git a/ykpers-args.c b/ykpers-args.c
index 35ddd650934398b53a461ee0f0a6673c286cb38f..dcfcdf4c6848dad533359fb683b05c0fbdf7ca83 100644 (file)
--- a/ykpers-args.c
+++ b/ykpers-args.c
@@ -40,6 +40,7 @@
 #include <ykpers.h>
 #include <yubikey.h> /* To get yubikey_modhex_encode and yubikey_hex_encode */
 #include <ykdef.h>
+#include <ykpers-version.h>
 #include "ykpers-args.h"
 
 #define YUBICO_OATH_VENDOR_ID_HEX      0xe1    /* UB as hex */
@@ -157,9 +158,10 @@ const char *usage =
 "-d        dry-run (don't write anything to key)\n"
 "\n"
 "-v        verbose\n"
+"-V        tool version\n"
 "-h        help (this text)\n"
 ;
-const char *optstring = "u12xza:c:n:t:hi:o:s:f:dvym:S::";
+const char *optstring = "u12xza:c:n:t:hi:o:s:f:dvym:S::V";
 
 static int _set_fixed(char *opt, YKP_CONFIG *cfg);
 static int _format_decimal_as_hex(uint8_t *dst, size_t dst_len, uint8_t *src);
@@ -671,6 +673,10 @@ int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, YK_KEY *yk,
                case 'y':
                        *autocommit = true;
                        break;
+               case 'V':
+                       fputs(YKPERS_VERSION_STRING "\n", stderr);
+                       *exit_code = 0;
+                       return 0;
                case 'h':
                default:
                        fputs(usage, stderr);

diff --git a/ykpersonalize.1 b/ykpersonalize.1
index ffaa5564c19764bbc8e0b6d85e4c8225ef4f250b..e311911e6a63c4a0ebd1aaab3d8a6510c139adff 100644 (file)
--- a/ykpersonalize.1
+++ b/ykpersonalize.1
@@ -38,7 +38,7 @@ ykpersonalize - personalize YubiKey OTP tokens
 .B ykpersonalize
 [\fI-1\fR | \fI-2\fR] [\fI-sfile\fR] [\fI-ifile\fR] [\fI-fformat\fR] [\fI-axxx\fR] [\fI-cxxx\fR]
 [\fI-ooption\fR] [\fI-y\fR] [\fI-v\fR] [\fI-d\fR] [\fI-h\fR] [\fI-n\fR] [\fI-t\fR] [\fI-u\fR] [\fI-x\fR]
-[\fI-z\fR] [\fI-m\fR] [\fI-S\fR]
+[\fI-z\fR] [\fI-m\fR] [\fI-S\fR] [\fI-V\fR]
 .\".SH DESCRIPTION
 .\" Add any additional description here
 .SH OPTIONS
@@ -133,6 +133,9 @@ Be more verbose
 \fB-h\fR
 Help
 .TP
+\fB-V\fR
+Version
+.TP
 \fBYubiKey NEO only\fR
 .RS
 .TP