summaryrefslogtreecommitdiffstats
path: root/ncr-key-wrap.c
diff options
context:
space:
mode:
Diffstat (limited to 'ncr-key-wrap.c')
-rw-r--r--ncr-key-wrap.c201
1 files changed, 175 insertions, 26 deletions
diff --git a/ncr-key-wrap.c b/ncr-key-wrap.c
index 25bd9e10686..7ea70cfc847 100644
--- a/ncr-key-wrap.c
+++ b/ncr-key-wrap.c
@@ -34,6 +34,8 @@
#include "ncr-int.h"
#include "cryptodev_int.h"
+#define KEY_WRAP_VERSION 0
+
typedef uint8_t val64_t[8];
static const val64_t initA = "\xA6\xA6\xA6\xA6\xA6\xA6\xA6\xA6";
@@ -264,7 +266,7 @@ static int wrap_aes_rfc5649(struct key_item_st* tobewrapped, struct key_item_st
void* output, size_t* output_size, const void* iv, size_t iv_size)
{
int ret;
-uint8_t* sdata;
+uint8_t* sdata = NULL;
size_t sdata_size = 0;
ret = key_to_packed_data(&sdata, &sdata_size, tobewrapped);
@@ -329,7 +331,7 @@ fail:
/* Wraps using the RFC3394 way.
*/
-static int wrap_aes(struct key_item_st* tobewrapped, struct key_item_st *kek,
+static int wrap_aes_rfc3394(struct key_item_st* tobewrapped, struct key_item_st *kek,
void* output, size_t *output_size, const void* iv, size_t iv_size)
{
size_t key_size, n;
@@ -594,7 +596,8 @@ int ret;
goto fail;
}
if (nla_strcmp(nla, NCR_WALG_AES_RFC3394) == 0)
- ret = wrap_aes(wkey, key, data, &data_size, iv, iv_size);
+ ret = wrap_aes_rfc3394(wkey, key, data, &data_size, iv,
+ iv_size);
else if (nla_strcmp(nla, NCR_WALG_AES_RFC5649) == 0)
ret = wrap_aes_rfc5649(wkey, key, data, &data_size, iv,
iv_size);
@@ -649,7 +652,7 @@ int ret;
goto fail;
}
- if (!(key->flags & NCR_KEY_FLAG_WRAPPING)) {
+ if (!(key->flags & NCR_KEY_FLAG_UNWRAPPING)) {
err();
ret = -EPERM;
goto fail;
@@ -823,11 +826,27 @@ fail:
return ret;
}
+#define DER_KEY_MAX_SIZE (KEY_DATA_MAX_SIZE+16)
+
+/* Packed data are DER encoded:
+ * PackedData ::= SEQUENCE {
+ * version INTEGER { v1(0) }
+ * type INTEGER { secret_key(0), rsa_privkey(1), rsa_pubkey(2), dsa_privkey(3), dsa_pubkey(4),
+ * dh_privkey(5), dh_pubkey(6) },
+ * data OCTET STRING
+ * }
+ *
+ * This allows distinguishing types of wrapped keys.
+ */
static int key_to_packed_data( uint8_t** sdata, size_t * sdata_size, const struct key_item_st *key)
{
- uint8_t * pkey;
- uint32_t usize;
- int ret;
+ uint8_t * pkey = NULL;
+ uint8_t * derkey = NULL;
+ uint32_t pkey_size;
+ int ret, err;
+ unsigned long version = KEY_WRAP_VERSION;
+ unsigned long type;
+ unsigned long derlen;
*sdata_size = KEY_DATA_MAX_SIZE;
pkey = kmalloc(*sdata_size, GFP_KERNEL);
@@ -836,55 +855,180 @@ static int key_to_packed_data( uint8_t** sdata, size_t * sdata_size, const struc
return -ENOMEM;
}
+ derlen = DER_KEY_MAX_SIZE;
+ derkey = kmalloc(derlen, GFP_KERNEL);
+ if (derkey == NULL) {
+ err();
+ goto fail;
+ }
+
if (key->type == NCR_KEY_TYPE_SECRET) {
memcpy(pkey, key->key.secret.data, key->key.secret.size);
- *sdata_size = key->key.secret.size;
+ pkey_size = key->key.secret.size;
+
+ type = 0;
} else if (key->type == NCR_KEY_TYPE_PRIVATE || key->type == NCR_KEY_TYPE_PUBLIC) {
- usize = *sdata_size;
- ret = ncr_pk_pack( key, pkey, &usize);
+ pkey_size = *sdata_size;
+ ret = ncr_pk_pack( key, pkey, &pkey_size);
if (ret < 0) {
err();
goto fail;
}
- *sdata_size = usize;
+
+ switch (key->algorithm->algo) {
+ case NCR_ALG_RSA:
+ if (key->type == NCR_KEY_TYPE_PUBLIC)
+ type = 2;
+ else type = 1;
+ break;
+ case NCR_ALG_DSA:
+ if (key->type == NCR_KEY_TYPE_PUBLIC)
+ type = 4;
+ else type = 3;
+ break;
+ case NCR_ALG_DH:
+ if (key->type == NCR_KEY_TYPE_PUBLIC)
+ type = 6;
+ else type = 5;
+ break;
+ default:
+ /* unsupported yet */
+ ret = -EINVAL;
+ err();
+ goto fail;
+ }
+
} else {
err();
ret = -EINVAL;
goto fail;
}
- *sdata = (void*)pkey;
+ err = der_encode_sequence_multi(derkey, &derlen,
+ LTC_ASN1_SHORT_INTEGER, 1UL, &version,
+ LTC_ASN1_SHORT_INTEGER, 1UL, &type,
+ LTC_ASN1_OCTET_STRING, (unsigned long)pkey_size, pkey,
+ LTC_ASN1_EOL, 0UL, NULL);
+
+ kfree(pkey);
+
+ if (err != CRYPT_OK) {
+ err();
+ ret = _ncr_tomerr(err);
+ goto fail;
+ }
+
+ *sdata = (void*)derkey;
+ *sdata_size = derlen;
return 0;
fail:
kfree(pkey);
+ kfree(derkey);
return ret;
}
+inline static int packed_type_to_key_type(unsigned long type, struct key_item_st* key)
+{
+ switch(type) {
+ case 0:
+ key->type = NCR_KEY_TYPE_SECRET;
+ key->algorithm = _ncr_algo_to_properties("cbc(aes)");
+ break;
+ case 1:
+ key->type = NCR_KEY_TYPE_PRIVATE;
+ key->algorithm = _ncr_algo_to_properties("rsa");
+ break;
+ case 2:
+ key->type = NCR_KEY_TYPE_PUBLIC;
+ key->algorithm = _ncr_algo_to_properties("rsa");
+ break;
+ case 3:
+ key->type = NCR_KEY_TYPE_PRIVATE;
+ key->algorithm = _ncr_algo_to_properties("dsa");
+ break;
+ case 4:
+ key->type = NCR_KEY_TYPE_PUBLIC;
+ key->algorithm = _ncr_algo_to_properties("dsa");
+ break;
+ case 5:
+ key->type = NCR_KEY_TYPE_PRIVATE;
+ key->algorithm = _ncr_algo_to_properties("dh");
+ break;
+ case 6:
+ key->type = NCR_KEY_TYPE_PUBLIC;
+ key->algorithm = _ncr_algo_to_properties("dh");
+ break;
+ default:
+ err();
+ return -EINVAL;
+ }
+
+ if (key->algorithm == NULL) {
+ err();
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+
+
+/* Unpack, or better decode the DER data
+ */
static int key_from_packed_data(struct nlattr *tb[], struct key_item_st *key,
const void *data, size_t data_size)
{
- const struct nlattr *nla;
- int ret;
+ ltc_asn1_list list[6];
+ int ret, i = 0, pkey_size, err;
+ unsigned long version, type;
+ uint8_t * pkey = NULL;
- if (data_size > KEY_DATA_MAX_SIZE) {
+ if (data_size > DER_KEY_MAX_SIZE) {
err();
return -EINVAL;
}
- key->algorithm = _ncr_nla_to_properties(tb[NCR_ATTR_ALGORITHM]);
- if (key->algorithm == NULL) {
+ pkey_size = KEY_DATA_MAX_SIZE;
+ pkey = kmalloc(pkey_size, GFP_KERNEL);
+ if (pkey == NULL) {
err();
- return -EINVAL;
+ return -ENOMEM;
}
- nla = tb[NCR_ATTR_KEY_TYPE];
- if (tb == NULL) {
+ list[i].type = LTC_ASN1_SHORT_INTEGER;
+ list[i].size = 1;
+ list[i++].data = &version;
+
+ list[i].type = LTC_ASN1_SHORT_INTEGER;
+ list[i].size = 1;
+ list[i++].data = &type;
+
+ list[i].type = LTC_ASN1_OCTET_STRING;
+ list[i].size = pkey_size;
+ list[i++].data = pkey;
+
+ err = der_decode_sequence(data, data_size, list, i);
+ if (err != CRYPT_OK) {
err();
- return -EINVAL;
+ ret = _ncr_tomerr(err);
+ goto fail;
+ }
+
+ if (version != KEY_WRAP_VERSION) {
+ err();
+ ret = -EINVAL;
+ goto fail;
+ }
+
+ pkey_size = list[2].size;
+
+ ret = packed_type_to_key_type(type, key);
+ if (ret < 0) {
+ err();
+ goto fail;
}
- key->type = nla_get_u32(nla);
ret = ncr_key_update_flags(key, tb[NCR_ATTR_KEY_FLAGS]);
if (ret != 0) {
@@ -897,12 +1041,12 @@ static int key_from_packed_data(struct nlattr *tb[], struct key_item_st *key,
err();
return -EINVAL;
}
- key->key.secret.size = data_size;
- memcpy(key->key.secret.data, data, data_size);
+ key->key.secret.size = pkey_size;
+ memcpy(key->key.secret.data, pkey, pkey_size);
} else if (key->type == NCR_KEY_TYPE_PUBLIC
|| key->type == NCR_KEY_TYPE_PRIVATE) {
- ret = ncr_pk_unpack( key, data, data_size);
+ ret = ncr_pk_unpack( key, pkey, pkey_size);
if (ret < 0) {
err();
return ret;
@@ -912,5 +1056,10 @@ static int key_from_packed_data(struct nlattr *tb[], struct key_item_st *key,
return -EINVAL;
}
- return 0;
+ ret = 0;
+
+fail:
+ kfree(pkey);
+
+ return ret;
}
generated by cgit (git 2.34.1) at 2024-05-07 10:25:27 +0000