diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-18 05:31:14 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-24 23:59:40 +0200 |
| commit | eef7de54be0cd38abb689de7b0a749154b04c694 (patch) | |
| tree | b7d62626d057fc65f7fef202d357fc5b357e7847 /ncr-key-storage.c | |
| parent | 650b6caa69d41753d6ad61f20dc6d46bc24b96ea (diff) | |
| download | cryptodev-linux-eef7de54be0cd38abb689de7b0a749154b04c694.tar.gz cryptodev-linux-eef7de54be0cd38abb689de7b0a749154b04c694.tar.xz cryptodev-linux-eef7de54be0cd38abb689de7b0a749154b04c694.zip | |
Replace ncr_algorithm_t by NLA_NUL_STRING
Diffstat (limited to 'ncr-key-storage.c')
| -rw-r--r-- | ncr-key-storage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ncr-key-storage.c b/ncr-key-storage.c index 149c45a..9afa2dc 100644 --- a/ncr-key-storage.c +++ b/ncr-key-storage.c @@ -35,7 +35,7 @@ struct packed_key { uint32_t version; uint8_t type; uint32_t flags; - uint16_t algorithm; /* valid for public/private keys */ + uint8_t algorithm[32]; /* NUL-terminated */ uint8_t key_id[MAX_KEY_ID_SIZE]; uint8_t key_id_size; @@ -59,7 +59,8 @@ int key_to_storage_data( uint8_t** sdata, size_t * sdata_size, const struct key_ pkey->version = THIS_VERSION; pkey->type = key->type; pkey->flags = key->flags; - pkey->algorithm = key->algorithm->algo; + BUG_ON(strlen(key->algorithm->kstr) > sizeof(pkey->algorithm) - 1); + strcpy(pkey->algorithm, key->algorithm->kstr); pkey->key_id_size = key->key_id_size; memcpy(pkey->key_id, key->key_id, key->key_id_size); @@ -95,6 +96,7 @@ int key_from_storage_data(struct key_item_st* key, const void* data, size_t data int ret; if (data_size != sizeof(*pkey) || pkey->version != THIS_VERSION + || memchr(pkey->algorithm, '\0', sizeof(pkey->algorithm)) == NULL || pkey->key_id_size > MAX_KEY_ID_SIZE) { err(); return -EINVAL; |