diff options
| author | Rob Austein <sra@hactrn.net> | 2016-11-21 23:36:36 -0500 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-11-21 23:36:36 -0500 |
| commit | 15efcdb3e2ebe20c35818447537728c9de2f089f (patch) | |
| tree | 3dffa84f8e69254043ad088350e13c6010a16382 /hal_internal.h | |
| parent | 834924b3e4d827f6db03d307a88e23bf95dc4624 (diff) | |
Whack attribute code with a club until it works with PKCS #11.
PKCS #11 supports zero-length attributes (eg, CKA_LABEL) so hack of
using zero length attribute as NIL value won't work, instead we use a
slightly more portable version of the hack PKCS #11 uses (PKCS #11
stuffs -1 into a CK_ULONG, we stuff 0xFFFFFFFF into a uint32_t).
ks_attribute.c code was trying too hard and tripping over its own
socks. Instead of trying to maintain attributes[] in place during
modification, we now perform the minimum necessary change then re-scan
the block. This is (very slightly) slower but more robust, both
because the scan code has better error checking and because it's the
scan code that we want to be sure is happy before committing a change.
Rename hal_rpc_pkey_attribute_t to hal_pkey_attribute_t.
Diffstat (limited to 'hal_internal.h')
| -rw-r--r-- | hal_internal.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/hal_internal.h b/hal_internal.h index 88424cf..9aa360b 100644 --- a/hal_internal.h +++ b/hal_internal.h @@ -243,7 +243,7 @@ typedef struct { const hal_key_type_t type, const hal_curve_name_t curve, const hal_key_flags_t flags, - const hal_rpc_pkey_attribute_t *attributes, + const hal_pkey_attribute_t *attributes, const unsigned attributes_len, hal_uuid_t *result, unsigned *result_len, @@ -251,11 +251,11 @@ typedef struct { const hal_uuid_t * const previous_uuid); hal_error_t (*set_attributes)(const hal_pkey_handle_t pkey, - const hal_rpc_pkey_attribute_t *attributes, + const hal_pkey_attribute_t *attributes, const unsigned attributes_len); hal_error_t (*get_attributes)(const hal_pkey_handle_t pkey, - hal_rpc_pkey_attribute_t *attributes, + hal_pkey_attribute_t *attributes, const unsigned attributes_len, uint8_t *attributes_buffer, const size_t attributes_buffer_len); @@ -462,7 +462,7 @@ struct hal_ks_driver { const hal_key_type_t type, const hal_curve_name_t curve, const hal_key_flags_t flags, - const hal_rpc_pkey_attribute_t *attributes, + const hal_pkey_attribute_t *attributes, const unsigned attributes_len, hal_uuid_t *result, unsigned *result_len, @@ -471,12 +471,12 @@ struct hal_ks_driver { hal_error_t (*set_attributes)(hal_ks_t *ks, hal_pkey_slot_t *slot, - const hal_rpc_pkey_attribute_t *attributes, + const hal_pkey_attribute_t *attributes, const unsigned attributes_len); hal_error_t (*get_attributes)(hal_ks_t *ks, hal_pkey_slot_t *slot, - hal_rpc_pkey_attribute_t *attributes, + hal_pkey_attribute_t *attributes, const unsigned attributes_len, uint8_t *attributes_buffer, const size_t attributes_buffer_len); @@ -591,7 +591,7 @@ static inline hal_error_t hal_ks_match(hal_ks_t *ks, const hal_key_type_t type, const hal_curve_name_t curve, const hal_key_flags_t flags, - const hal_rpc_pkey_attribute_t *attributes, + const hal_pkey_attribute_t *attributes, const unsigned attributes_len, hal_uuid_t *result, unsigned *result_len, @@ -610,7 +610,7 @@ static inline hal_error_t hal_ks_match(hal_ks_t *ks, static inline hal_error_t hal_ks_set_attributes(hal_ks_t *ks, hal_pkey_slot_t *slot, - const hal_rpc_pkey_attribute_t *attributes, + const hal_pkey_attribute_t *attributes, const unsigned attributes_len) { if (ks == NULL || ks->driver == NULL || slot == NULL || @@ -625,7 +625,7 @@ static inline hal_error_t hal_ks_set_attributes(hal_ks_t *ks, static inline hal_error_t hal_ks_get_attributes(hal_ks_t *ks, hal_pkey_slot_t *slot, - hal_rpc_pkey_attribute_t *attributes, + hal_pkey_attribute_t *attributes, const unsigned attributes_len, uint8_t *attributes_buffer, const size_t attributes_buffer_len) @@ -780,19 +780,19 @@ extern const size_t hal_ks_attribute_header_size; extern hal_error_t hal_ks_attribute_scan(const uint8_t * const bytes, const size_t bytes_len, - hal_rpc_pkey_attribute_t *attributes, + hal_pkey_attribute_t *attributes, const unsigned attributes_len, size_t *total_len); extern hal_error_t hal_ks_attribute_delete(uint8_t *bytes, const size_t bytes_len, - hal_rpc_pkey_attribute_t *attributes, + hal_pkey_attribute_t *attributes, unsigned *attributes_len, size_t *total_len, const uint32_t type); extern hal_error_t hal_ks_attribute_insert(uint8_t *bytes, const size_t bytes_len, - hal_rpc_pkey_attribute_t *attributes, + hal_pkey_attribute_t *attributes, unsigned *attributes_len, size_t *total_len, const uint32_t type, |