From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 29 Oct 2012 14:23:08 +0000 (+0100)
Subject: Add ykinfo -a flag.
X-Git-Tag: v1.9.0~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c985a7d0043a40cb9f54be79e4790b303ba619fd;p=yubikey-personalization

Add ykinfo -a flag.
---

diff --git a/NEWS b/NEWS
index 2c7ac3b..9a33832 100644
--- 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 fbeb59d..f13f854 100644
--- 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 4f6d415..c98a300 100644
--- 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;