From 73cf9125fae0d3873095d9faee178c7a9c04ec90 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Fri, 6 Aug 2010 01:55:25 +0200 Subject: Implement DH key params New function ncr_key_params_set_dh_pub(), replacing ncr_key_params_set_dh_key(). --- userspace/ncrypto.h | 2 +- userspace/ncrypto_params.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'userspace') diff --git a/userspace/ncrypto.h b/userspace/ncrypto.h index 6f75de8..cc30f2f 100644 --- a/userspace/ncrypto.h +++ b/userspace/ncrypto.h @@ -46,7 +46,7 @@ int ncr_masterkey_set(void *key, size_t key_size); int ncr_key_params_init(ncr_key_params_t *key_params); void ncr_key_params_deinit(ncr_key_params_t key_params); int ncr_key_params_set_cipher_iv(ncr_key_params_t key_params, void* iv, unsigned int iv_size); -int ncr_key_params_set_dh_key(ncr_key_params_t key_params, ncr_key_t dh_priv); +int ncr_key_params_set_dh_pub(ncr_key_params_t params, void *pub, size_t pub_size); int ncr_session_once_key_data(ncr_key_t key, ncr_key_params_t params, ncr_crypto_op_t op, ncr_algorithm_t algorithm, ncr_key_t input, void *output, size_t output_size); int ncr_session_once_direct_data(ncr_key_t key, ncr_key_params_t params, ncr_crypto_op_t op, ncr_algorithm_t algorithm, void *input, size_t input_size, void *output, size_t output_size); diff --git a/userspace/ncrypto_params.c b/userspace/ncrypto_params.c index d365432..253664b 100644 --- a/userspace/ncrypto_params.c +++ b/userspace/ncrypto_params.c @@ -47,9 +47,14 @@ ncr_key_params_set_cipher_iv(ncr_key_params_t params, void* iv, unsigned int iv_ } int -ncr_key_params_set_dh_key(ncr_key_params_t params, ncr_key_t dh_priv) +ncr_key_params_set_dh_pub(ncr_key_params_t params, void *pub, size_t pub_size) { - errno = EINVAL; - return -1; + if (!params || !pub || !pub_size) { + errno = EINVAL; + return -1; + } + params->params.dh.pub = pub; + params->params.dh.pub_size = pub_size; + return 0; } -- cgit