diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 15:00:17 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 15:00:17 +0200 |
| commit | c61c13594953d462597ed18d6c77e736878ff9d9 (patch) | |
| tree | 583b7cb956cb9fce6c630cc634e772942e3bbaf7 /crypto/userspace/ncr-key-storage.c | |
| parent | 9cab3a1a9660ed5f798b063aa7e827eb0c95ba94 (diff) | |
| parent | 8afc069c742f80d3e383ba3d0e38697aeeeb147b (diff) | |
| download | kernel-crypto-ncr-standalone-rename.tar.gz kernel-crypto-ncr-standalone-rename.tar.xz kernel-crypto-ncr-standalone-rename.zip | |
Merge branch 'standalone-master' into standalone-renamencr-standalone-rename
Conflicts:
crypto/userspace/libtomcrypt/misc/qsort.c
crypto/userspace/libtommath/bn_mp_and.c
crypto/userspace/libtommath/bn_mp_exteuclid.c
crypto/userspace/libtommath/bn_mp_jacobi.c
crypto/userspace/libtommath/bn_mp_or.c
crypto/userspace/libtommath/bn_mp_prime_fermat.c
crypto/userspace/libtommath/bn_mp_radix_size.c
crypto/userspace/libtommath/bn_mp_radix_smap.c
crypto/userspace/libtommath/bn_mp_read_radix.c
crypto/userspace/libtommath/bn_mp_sqrt.c
crypto/userspace/libtommath/bn_mp_toradix.c
crypto/userspace/libtommath/bn_mp_toradix_n.c
crypto/userspace/libtommath/bn_mp_xor.c
examples/Makefile
examples/ncr.c
examples/pk.c
Diffstat (limited to 'crypto/userspace/ncr-key-storage.c')
| -rw-r--r-- | crypto/userspace/ncr-key-storage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/userspace/ncr-key-storage.c b/crypto/userspace/ncr-key-storage.c index 9afa2dc0411..bc64131ea82 100644 --- a/crypto/userspace/ncr-key-storage.c +++ b/crypto/userspace/ncr-key-storage.c @@ -35,7 +35,7 @@ struct packed_key { uint32_t version; uint8_t type; uint32_t flags; - uint8_t algorithm[32]; /* NUL-terminated */ + uint32_t algorithm; uint8_t key_id[MAX_KEY_ID_SIZE]; uint8_t key_id_size; @@ -43,7 +43,7 @@ struct packed_key { uint32_t raw_size; } __attribute__((__packed__)); -#define THIS_VERSION 1 +#define THIS_VERSION 2 int key_to_storage_data( uint8_t** sdata, size_t * sdata_size, const struct key_item_st *key) { @@ -59,8 +59,9 @@ 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; - BUG_ON(strlen(key->algorithm->kstr) > sizeof(pkey->algorithm) - 1); - strcpy(pkey->algorithm, key->algorithm->kstr); + + pkey->algorithm = key->algorithm->algo; + pkey->key_id_size = key->key_id_size; memcpy(pkey->key_id, key->key_id, key->key_id_size); @@ -96,7 +97,6 @@ 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; |