Add ykinfo -a flag.

diff --git a/NEWS b/NEWS
index 2c7ac3bbd4c8c5a02c1a08dd93e693b8d46af84e..9a33832b2f65d97182bdc89e0487458f3878c9cc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@ Yubikey-personalize NEWS -- History of user-visible changes.     -*- outline -*-
 
 * Version 1.8.3 (unreleased)
 
+** ykinfo: New tool to print information about YubiKey.
+
+** ykpersonalize: Add -z flag to zap configuration on YubiKey.
+
+** Fix PBKDF2 implementation.
+
 * Version 1.8.2 (released 2012-10-17)
 
 ** Add udev rules files to packed distribution.

diff --git a/ykinfo.1 b/ykinfo.1
index fbeb59d35c5899ca5b173c72566d42e3888b408a..f13f854b6a645c2ca1019d4304f40a6713c8f1f9 100644 (file)
--- a/ykinfo.1
+++ b/ykinfo.1
@@ -61,6 +61,9 @@ get the touch level and output it.
 \fB\-p\fR
 get the programming sequence and output it.
 .TP
+\fB\-a\fR
+get all the information above.
+.TP
 \fB\-q\fR
 modifier, only show the relevant data from the YubiKey, no extra information.
 .TP

diff --git a/ykinfo.c b/ykinfo.c
index 4f6d415659d39e86a3b277a8e936b2bb7f782fc8..c98a3003b5a839115659f48c0b42f677e4faebfe 100644 (file)
--- a/ykinfo.c
+++ b/ykinfo.c
@@ -49,6 +49,7 @@ const char *usage =
        "\t-v        Get version from YubiKey\n"
        "\t-t        Get touchlevel from YubiKey\n"
        "\t-p        Get programming sequence from YubiKey\n"
+       "\t-a        Get all information above\n"
        "\n"
        "\t-q        Only output information from YubiKey\n"
        "\n"
@@ -56,7 +57,7 @@ const char *usage =
        "\n"
        "\n"
        ;
-const char *optstring = "smHvtpqh";
+const char *optstring = "asmHvtpqh";
 
 static void report_yk_error(void)
 {
@@ -80,6 +81,14 @@ static int parse_args(int argc, char **argv,
 
        while((c = getopt(argc, argv, optstring)) != -1) {
                switch (c) {
+               case 'a':
+                       *serial_dec = true;
+                       *serial_modhex = true;
+                       *serial_hex = true;
+                       *version = true;
+                       *touch_level = true;
+                       *pgm_seq = true;
+                       break;
                case 's':
                        *serial_dec = true;
                        break;