diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-06 02:32:40 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-23 20:01:59 +0200 |
| commit | 7ce2ba83b7c5aa729d2f6118f039ee0fffceceae (patch) | |
| tree | e57097770466b2bc01f4df160d60b71fda1af0db | |
| parent | 18e1c9aa347e5cf8f6d28820d27c7e3083a24e38 (diff) | |
| download | cryptodev-linux-7ce2ba83b7c5aa729d2f6118f039ee0fffceceae.tar.gz cryptodev-linux-7ce2ba83b7c5aa729d2f6118f039ee0fffceceae.tar.xz cryptodev-linux-7ce2ba83b7c5aa729d2f6118f039ee0fffceceae.zip | |
Add derivation algorithm param to ncr_key_derive()
| -rw-r--r-- | userspace/ncrypto.h | 2 | ||||
| -rw-r--r-- | userspace/ncrypto_key.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/userspace/ncrypto.h b/userspace/ncrypto.h index 2660dde..9e32291 100644 --- a/userspace/ncrypto.h +++ b/userspace/ncrypto.h @@ -28,7 +28,7 @@ int ncr_key_generate_params_set_dh(ncr_key_generate_params_t params, void *p, si int ncr_key_init(ncr_key_t *key); int ncr_key_generate(ncr_key_t key, ncr_key_generate_params_t params); int ncr_key_generate_pair(ncr_key_t key1, ncr_key_t key2, ncr_key_generate_params_t params); -int ncr_key_derive(ncr_key_t newkey, unsigned int keyflags, ncr_key_t key, ncr_key_params_t key_params); +int ncr_key_derive(ncr_key_t newkey, unsigned int keyflags, ncr_key_t key, ncr_derive_t derive, ncr_key_params_t key_params); ncr_algorithm_t ncr_key_get_algorithm(ncr_key_t key); int ncr_key_get_flags(ncr_key_t key); ncr_key_type_t ncr_key_get_type(ncr_key_t key); diff --git a/userspace/ncrypto_key.c b/userspace/ncrypto_key.c index db46ee4..924ac22 100644 --- a/userspace/ncrypto_key.c +++ b/userspace/ncrypto_key.c @@ -74,7 +74,7 @@ ncr_key_generate_pair(ncr_key_t key1, ncr_key_t key2, ncr_key_generate_params_t } int -ncr_key_derive(ncr_key_t newkey, unsigned int keyflags, ncr_key_t key, ncr_key_params_t params) +ncr_key_derive(ncr_key_t newkey, unsigned int keyflags, ncr_key_t key, ncr_derive_t derive, ncr_key_params_t params) { struct ncr_key_derivation_params_st io; memset(&io, 0, sizeof(io)); @@ -84,6 +84,7 @@ ncr_key_derive(ncr_key_t newkey, unsigned int keyflags, ncr_key_t key, ncr_key_p return -1; } + io.derive = derive; io.newkey = newkey; io.key = key; io.keyflags = keyflags; |