Ticket #118: algorithm.diff

src/tools/pkcs15-tool.c

@@ -67 +67 @@
         OPT_PIN,
         OPT_NEWPIN,
         OPT_PUK,
+        OPT_LIST_ALG,
 };
 
 #define NELEMENTS(x)    (sizeof(x)/sizeof((x)[0]))
@@ -100 +101 @@
         { "auth-id",            required_argument, 0,   'a' },
         { "wait",               no_argument, 0,         'w' },
         { "verbose",            no_argument, 0,         'v' },
+        { "list-algorithms",    no_argument, 0,         OPT_LIST_ALG },
         { 0, 0, 0, 0 }
 };
 
@@ -126 +128 @@
         "The auth ID of the PIN to use",
         "Wait for card insertion",
         "Verbose operation. Use several times to enable debug output.",
+        "Lists Algorithms supported by card",
 };
 
 sc_context_t *ctx = NULL;
@@ -917 +920 @@
         return 0;
 }
 
+static int list_algorithms(void)
+{
+        int i;
+        const char *aname;
+
+        if (verbose)
+                printf("Card supports %d algorithm(s)\n\n",card->algorithm_count);
+
+        for (i=0; i < card->algorithm_count; i++) {
+                switch (card->algorithms[i].algorithm) {
+                case SC_ALGORITHM_RSA:
+                        aname = "rsa";
+                        break;
+                case SC_ALGORITHM_DSA:
+                        aname = "dsa";
+                        aname = "ec";
+                        break;
+                case SC_ALGORITHM_DES:
+                        aname = "des";
+                        break;
+                case SC_ALGORITHM_3DES:
+                        aname = "3des";
+                        break;
+                case SC_ALGORITHM_MD5:
+                        aname = "md5";
+                        break;
+                case SC_ALGORITHM_SHA1:
+                        aname = "sha1";
+                        break;
+                case SC_ALGORITHM_PBKDF2:
+                        aname = "pbkdf2";
+                        break;
+                case SC_ALGORITHM_PBES2:
+                        aname = "pbes2";
+                        break;
+                default:
+                        aname = "unknown";
+                        break;
+                }
+
+                printf("Algorithm: %s\n", aname);
+                printf("Key length: %d\n", card->algorithms[i].key_length);
+                printf("Flags:");
+                if (card->algorithms[i].flags & SC_ALGORITHM_ONBOARD_KEY_GEN)
+                        printf(" onboard key generation");
+                if (card->algorithms[i].flags & SC_ALGORITHM_NEED_USAGE)
+                        printf(" needs usage");
+                if ( card->algorithms[i].algorithm == SC_ALGORITHM_RSA) {
+                        int padding = card->algorithms[i].flags
+                                        & SC_ALGORITHM_RSA_PADS;
+                        int hashes =  card->algorithms[i].flags
+                                        & SC_ALGORITHM_RSA_HASHES;
+                                        
+                        printf(" padding (");
+                        if (padding == SC_ALGORITHM_RSA_PAD_NONE) 
+                                printf(" none");
+                        if (padding & SC_ALGORITHM_RSA_PAD_PKCS1)
+                                printf(" pkcs1");
+                        if (padding & SC_ALGORITHM_RSA_PAD_ANSI)
+                                printf(" ansi");
+                        if (padding & SC_ALGORITHM_RSA_PAD_ISO9796)
+                                printf(" iso9796");
+
+                        printf(" ) ");
+                        printf("hashes (");
+                        if (hashes & SC_ALGORITHM_RSA_HASH_NONE)
+                                printf(" none");
+                        if (hashes & SC_ALGORITHM_RSA_HASH_SHA1)
+                                printf(" sha1");
+                        if (hashes & SC_ALGORITHM_RSA_HASH_MD5)
+                                printf(" MD5");
+                        if (hashes & SC_ALGORITHM_RSA_HASH_MD5_SHA1)
+                                printf(" md5-sha1");
+                        if (hashes & SC_ALGORITHM_RSA_HASH_RIPEMD160)
+                                printf(" ripemd160");
+                        printf(" )");
+                }
+                printf("\n");
+                if (card->algorithms[i].algorithm == SC_ALGORITHM_RSA 
+                        && card->algorithms[i].u._rsa.exponent) {
+                        printf("RSA public exponent: %lu\n", (unsigned long)
+                                card->algorithms[i].u._rsa.exponent);
+                }
+
+                if (i < card->algorithm_count)
+                        printf("\n");
+        }
+        return 0;
+}
+
 static int dump()
 {
 
@@ -1183 +1276 @@
         int do_change_pin = 0;
         int do_unblock_pin = 0;
         int do_learn_card = 0;
+        int do_list_algorithms = 0;
         int action_count = 0;
         sc_context_param_t ctx_param;
 
@@ -1278 +1372 @@
                 case 'w':
                         opt_wait = 1;
                         break;
+                case OPT_LIST_ALG:
+                        do_list_algorithms = 1;
+                        action_count++;
+                        break;
                 }
         }
         if (action_count == 0)
@@ -1299 +1397 @@
         if (err)
                 goto end;
 
+        if (do_list_algorithms) {
+                if ((err = list_algorithms()))
+                        goto end;
+                action_count--;
+        }
+        if (action_count <= 0)
+                goto end;
+
         if (verbose)
                 fprintf(stderr, "Trying to find a PKCS#15 compatible card...\n");
         r = sc_pkcs15_bind(card, &p15card);

src/libopensc/opensc.h

@@ -164 +164 @@
 /* Key encryption algoprithms */
 #define SC_ALGORITHM_PBES2              256
 
+/* Algorithm flags */
 #define SC_ALGORITHM_ONBOARD_KEY_GEN    0x80000000
 #define SC_ALGORITHM_NEED_USAGE         0x40000000
 #define SC_ALGORITHM_SPECIFIC_FLAGS     0x0000FFFF