Ticket #198: access_flags.patch

src/tools/pkcs15-init.c

@@ -1408 +1408 @@
 
         if ((r = init_keyargs(&keygen_args.prkey_args)) < 0)
                 return r;
+        keygen_args.prkey_args.access_flags |= SC_PKCS15_PRKEY_ACCESS_SENSITIVE|SC_PKCS15_PRKEY_ACCESS_ALWAYSSENSITIVE|SC_PKCS15_PRKEY_ACCESS_NEVEREXTRACTABLE|SC_PKCS15_PRKEY_ACCESS_LOCAL;
 
         /* Parse the key spec given on the command line */
         if (!strncasecmp(spec, "rsa", 3)) {
@@ -1498 +1499 @@
                 return SC_ERROR_INVALID_ARGUMENTS;
         }
         if (opt_extractable) {
-                args->flags |= SC_PKCS15INIT_EXTRACTABLE;
+                args->access_flags |= SC_PKCS15_PRKEY_ACCESS_EXTRACTABLE;
                 if (opt_passphrase) {
                         args->passphrase = opt_passphrase;
                 } else {

src/pkcs15init/pkcs15-lib.c

@@ -1005 +1005 @@
         key_info->native = 1;
         key_info->key_reference = 0;
         key_info->modulus_length = keybits;
-        key_info->access_flags = DEFAULT_PRKEY_ACCESS_FLAGS;
+        key_info->access_flags = keyargs->access_flags;
         /* Path is selected below */
 
-        if (keyargs->flags & SC_PKCS15INIT_EXTRACTABLE) {
-                key_info->access_flags |= SC_PKCS15_PRKEY_ACCESS_EXTRACTABLE;
+        if (keyargs->access_flags & SC_PKCS15_PRKEY_ACCESS_EXTRACTABLE) {
                 key_info->access_flags &= ~SC_PKCS15_PRKEY_ACCESS_NEVEREXTRACTABLE;
                 key_info->native = 0;
         }
@@ -1188 +1187 @@
                         keyargs->x509_usage, keybits, 0)) {
                 /* Make sure the caller explicitly tells us to store
                  * the key non-natively. */
-                if (!(keyargs->flags & SC_PKCS15INIT_EXTRACTABLE))
+                if (!(keyargs->access_flags & SC_PKCS15_PRKEY_ACCESS_EXTRACTABLE))
                         SC_TEST_RET(ctx, SC_ERROR_INCOMPATIBLE_KEY, "Card does not support this key.");
 
                 if (!keyargs->passphrase
@@ -1207 +1206 @@
 
         /* Get the number of private keys already on this card */
         idx = sc_pkcs15_get_objects(p15card, SC_PKCS15_TYPE_PRKEY, NULL, 0);
-        if (!(keyargs->flags & SC_PKCS15INIT_EXTRACTABLE)) {
+        if (!(keyargs->access_flags & SC_PKCS15_PRKEY_ACCESS_EXTRACTABLE)) {
                 r = profile->ops->create_key(profile, p15card, object);
                 SC_TEST_RET(ctx, r, "Card specific 'create key' failed");
 

src/pkcs15init/pkcs15-init.h

@@ -191 +191 @@
         unsigned long           usage;
         unsigned long           x509_usage;
         unsigned int            flags;
+        unsigned int            access_flags;
         struct sc_pkcs15init_keyarg_gost_params gost_params;
 
         sc_pkcs15_prkey_t       key;
@@ -204 +205 @@
         const char *                   pubkey_label;
 };
 
-#define SC_PKCS15INIT_EXTRACTABLE       0x0001
 #define SC_PKCS15INIT_NO_PASSPHRASE     0x0002
 #define SC_PKCS15INIT_SPLIT_KEY         0x0004