diff options
| author | Rob Austein <sra@hactrn.net> | 2016-10-07 20:23:45 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-10-07 20:23:45 -0400 |
| commit | 45061e2df746f597195b80376fc405b4538b5420 (patch) | |
| tree | 52a132edc29b028ceec5f111a4264d4873f99064 /hal.h | |
| parent | b89d9e30c928724fd4aac579067708cffc55f003 (diff) | |
Fix session handle arguments in RPC calls.
RPC calls which pass a pkey handle don't need to pass a session
handle, because the session handle is already in the HSM's pkey slot
object; pkey RPC calls which don't pass a pkey argument do need to
pass a session handle.
This change percolates down to the keystore driver, because only the
keystore driver knows whether that particular keystore cares about
session handles.
Diffstat (limited to 'hal.h')
| -rw-r--r-- | hal.h | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -736,16 +736,12 @@ extern size_t hal_rpc_pkey_get_public_key_len(const hal_pkey_handle_t pkey); extern hal_error_t hal_rpc_pkey_get_public_key(const hal_pkey_handle_t pkey, uint8_t *der, size_t *der_len, const size_t der_max); -#warning Um, why do hal_rpc_pkey_sign() and hal_rpc_pkey_verify() take session arguments? - -extern hal_error_t hal_rpc_pkey_sign(const hal_session_handle_t session, - const hal_pkey_handle_t pkey, +extern hal_error_t hal_rpc_pkey_sign(const hal_pkey_handle_t pkey, const hal_hash_handle_t hash, const uint8_t * const input, const size_t input_len, uint8_t * signature, size_t *signature_len, const size_t signature_max); -extern hal_error_t hal_rpc_pkey_verify(const hal_session_handle_t session, - const hal_pkey_handle_t pkey, +extern hal_error_t hal_rpc_pkey_verify(const hal_pkey_handle_t pkey, const hal_hash_handle_t hash, const uint8_t * const input, const size_t input_len, const uint8_t * const signature, const size_t signature_len); @@ -758,7 +754,8 @@ typedef struct { /* ... */ } hal_pkey_info_t; -extern hal_error_t hal_rpc_pkey_list(hal_pkey_info_t *result, +extern hal_error_t hal_rpc_pkey_list(const hal_session_handle_t session, + hal_pkey_info_t *result, unsigned *result_len, const unsigned result_max, hal_key_flags_t flags); @@ -769,7 +766,8 @@ typedef struct { const uint8_t *value; } hal_rpc_pkey_attribute_t; -extern hal_error_t hal_rpc_pkey_match(const hal_key_type_t type, +extern hal_error_t hal_rpc_pkey_match(const hal_session_handle_t session, + const hal_key_type_t type, const hal_curve_name_t curve, const hal_key_flags_t flags, hal_rpc_pkey_attribute_t *attributes, |