p11tool: If there is only a single token available, don't bother complaining about...

diff --git a/src/p11tool.c b/src/p11tool.c
index 898092dd0555041f16c6e47d7c93a86b0c1ed09f..72e8888df9bf46ef01f84272731c6377584418e4 100644 (file)
--- a/src/p11tool.c
+++ b/src/p11tool.c
@@ -202,7 +202,7 @@ static void cmd_parser(int argc, char **argv)
        /* handle actions 
         */
        if (HAVE_OPT(LIST_TOKENS))
-               pkcs11_token_list(outfile, detailed_url, &cinfo);
+               pkcs11_token_list(outfile, detailed_url, &cinfo, 0);
        else if (HAVE_OPT(LIST_MECHANISMS))
                pkcs11_mechanism_list(outfile, url, login, &cinfo);
        else if (HAVE_OPT(GENERATE_RANDOM))

diff --git a/src/p11tool.h b/src/p11tool.h
index 2fe8b1f28e2227acb6a00b43a757df711467d9c8..c9e86e7647c7844f28dce041e3067e01b3c38f66 100644 (file)
--- a/src/p11tool.h
+++ b/src/p11tool.h
@@ -39,7 +39,7 @@ pkcs11_export_chain(FILE * outfile, const char *url, unsigned int login,
              common_info_st * info);
 
 void pkcs11_token_list(FILE * outfile, unsigned int detailed,
-                      common_info_st *);
+                      common_info_st *, unsigned brief);
 void pkcs11_write(FILE * outfile, const char *pkcs11_url,
                  const char *label, int trusted, 
                  int ca, int private,

diff --git a/src/pkcs11.c b/src/pkcs11.c
index c7fa1d106a91a5e4d37f7ea4b51c7769cbe3e271..790567f4d7862cd7289215157fdfe4694480b744 100644 (file)
--- a/src/pkcs11.c
+++ b/src/pkcs11.c
@@ -34,10 +34,17 @@
 #include <stdint.h>
 #include <common.h>
 
-#define FIX(url) \
+static
+char *get_single_token_url(common_info_st * info);
+
+#define FIX(url, out, det, info) \
        if (url == NULL) { \
-               fprintf(stderr, "warning: no token URL was provided for this operation;\nuse --list-tokens for the available ones.\n"); \
-               exit(1); \
+               url = get_single_token_url(info); \
+               if (url == NULL) { \
+                       fprintf(stderr, "warning: no token URL was provided for this operation; the available tokens are:\n"); \
+                       pkcs11_token_list(out, det, info, 1); \
+                       exit(1); \
+               } \
        }
 
 #define CHECK_LOGIN_FLAG(flag) \
@@ -95,7 +102,7 @@ pkcs11_list(FILE * outfile, const char *url, int type, unsigned int login_flags,
 
        pkcs11_common();
 
-       FIX(url);
+       FIX(url, outfile, detailed, info);
 
        if (type == PKCS11_TYPE_TRUSTED) {
                attrs = GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED;
@@ -185,7 +192,7 @@ pkcs11_export(FILE * outfile, const char *url, unsigned int login_flags,
 
        pkcs11_common();
 
-       FIX(url);
+       FIX(url, outfile, 0, info);
 
        ret = gnutls_pkcs11_obj_init(&obj);
        if (ret < 0) {
@@ -233,7 +240,7 @@ pkcs11_export_chain(FILE * outfile, const char *url, unsigned int login_flags,
 
        pkcs11_common();
 
-       FIX(url);
+       FIX(url, outfile, 0, info);
 
        ret = gnutls_pkcs11_obj_init(&obj);
        if (ret < 0) {
@@ -318,9 +325,33 @@ pkcs11_export_chain(FILE * outfile, const char *url, unsigned int login_flags,
        return;
 }
 
+/* If there is a single token only present, return its URL.
+ */
+static
+char *get_single_token_url(common_info_st * info)
+{
+       int ret;
+       char *url = NULL, *t = NULL;
+
+       pkcs11_common();
+
+       ret = gnutls_pkcs11_token_get_url(0, 0, &url);
+       if (ret < 0)
+               return NULL;
+
+       ret = gnutls_pkcs11_token_get_url(1, 0, &t);
+       if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) {
+               gnutls_free(url);
+               gnutls_free(t);
+               return NULL;
+       }
+
+       return url;
+}
+
 void
 pkcs11_token_list(FILE * outfile, unsigned int detailed,
-                 common_info_st * info)
+                 common_info_st * info, unsigned brief)
 {
        int ret;
        int i;
@@ -343,6 +374,9 @@ pkcs11_token_list(FILE * outfile, unsigned int detailed,
 
                fprintf(outfile, "Token %d:\n\tURL: %s\n", i, url);
 
+               if (brief != 0)
+                       goto cont;
+
                size = sizeof(buf);
                ret =
                    gnutls_pkcs11_token_get_info(url,
@@ -395,7 +429,7 @@ pkcs11_token_list(FILE * outfile, unsigned int detailed,
 
                fprintf(outfile, "\tSerial: %s\n", buf);
                fprintf(outfile, "\n\n");
-
+ cont:
                gnutls_free(url);
 
        }
@@ -419,7 +453,7 @@ pkcs11_write(FILE * outfile, const char *url, const char *label,
 
        pkcs11_common();
 
-       FIX(url);
+       FIX(url, outfile, 0, info);
        CHECK_LOGIN_FLAG(login_flags);
 
        secret_key = load_secret_key(0, info);
@@ -500,7 +534,7 @@ pkcs11_generate(FILE * outfile, const char *url, gnutls_pk_algorithm_t pk,
 
        pkcs11_common();
 
-       FIX(url);
+       FIX(url, outfile, detailed, info);
        CHECK_LOGIN_FLAG(login_flags);
 
        if (outfile == stderr || outfile == stdout) {
@@ -813,7 +847,7 @@ pkcs11_mechanism_list(FILE * outfile, const char *url, unsigned int login_flags,
 
        pkcs11_common();
 
-       FIX(url);
+       FIX(url, outfile, 0, info);
 
        idx = 0;
        do {
@@ -846,7 +880,7 @@ pkcs11_get_random(FILE * outfile, const char *url, unsigned bytes,
 
        pkcs11_common();
 
-       FIX(url);
+       FIX(url, outfile, 0, info);
 
        output = malloc(bytes);
        if (output == NULL) {