API cleanup: pkey_open() and pkey_match().

pkey_open() now looks in both keystores rather than requiring the user
to know.  The chance of collision with randomly-generated UUID is low
enough that we really ought to be able to present a single namespace.
So now we do.

pkey_match() now takes a couple of extra arguments which allow a
single search to cover both keystores, as well as matching for
specific key flags.  The former interface was pretty much useless for
anything involving flags, and required the user to issue a separate
call for each keystore.

User wheel is now exempt from the per-session key lookup constraints,
Whether this is a good idea or not is an interesting question, but the
whole PKCS #11 derived per-session key thing is weird to begin with,
and having keystore listings on the console deliberately ignore
session keys was just too confusing.

1 files changed, 8 insertions, 1 deletions

diff --git a/ks_volatile.c b/ks_volatile.c
index 9762da3..6d65578 100644
--- a/ks_volatile.c
+++ b/ks_volatile.c
@@ -124,7 +124,10 @@ static inline int key_visible_to_session(const ks_t * const ksv,
                                          const hal_session_handle_t session,
                                          const ks_key_t * const k)
 {
-  return !ksv->per_session || client.handle == HAL_HANDLE_NONE || k->client.handle  == client.handle;
+  return (!ksv->per_session ||
+          client.handle == HAL_HANDLE_NONE ||
+          k->client.handle  == client.handle ||
+          hal_rpc_is_logged_in(client, HAL_USER_WHEEL) == HAL_OK);
 }
 
 static inline void *gnaw(uint8_t **mem, size_t *len, const size_t size)
@@ -385,6 +388,7 @@ static hal_error_t ks_match(hal_ks_t *ks,
                             hal_session_handle_t session,
                             const hal_key_type_t type,
                             const hal_curve_name_t curve,
+                            const hal_key_flags_t mask,
                             const hal_key_flags_t flags,
                             const hal_pkey_attribute_t *attributes,
                             const unsigned attributes_len,
@@ -429,6 +433,9 @@ static hal_error_t ks_match(hal_ks_t *ks,
     if (curve != HAL_CURVE_NONE && curve != ksv->db->keys[b].curve)
       continue;
 
+    if (((flags ^ ksv->db->keys[b].flags) & mask) != 0)
+      continue;
+
     if (!key_visible_to_session(ksv, client, session, &ksv->db->keys[b]))
       continue;