diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-27 18:04:50 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-27 18:04:50 +0200 |
| commit | e6b93d8a7e1d3d4a3d76312fc84319ff6d596067 (patch) | |
| tree | eb79baf203de7e9574cc52ff0536478392c3dd4c /crypto/userspace/ncr-int.h | |
| parent | 7cc28b8bafe112037edae18ea0e590e7c9d074fa (diff) | |
| parent | d5c2b894102e59efe499c231a32065afcf37e463 (diff) | |
| download | kernel-crypto-e6b93d8a7e1d3d4a3d76312fc84319ff6d596067.tar.gz kernel-crypto-e6b93d8a7e1d3d4a3d76312fc84319ff6d596067.tar.xz kernel-crypto-e6b93d8a7e1d3d4a3d76312fc84319ff6d596067.zip | |
Merge branch 'standalone-rename' into userspace-crypto
Conflicts:
crypto/userspace/Makefile
Diffstat (limited to 'crypto/userspace/ncr-int.h')
| -rw-r--r-- | crypto/userspace/ncr-int.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/userspace/ncr-int.h b/crypto/userspace/ncr-int.h index db6950b596c..5572f71f217 100644 --- a/crypto/userspace/ncr-int.h +++ b/crypto/userspace/ncr-int.h @@ -5,6 +5,7 @@ #include <asm/atomic.h> #include "cryptodev_int.h" #include <ncr-pk.h> +#include <ncr-dh.h> #define KEY_DATA_MAX_SIZE 3*1024 @@ -18,6 +19,7 @@ struct algo_properties_st { unsigned can_sign:1; unsigned can_digest:1; unsigned can_encrypt:1; + unsigned can_kx:1; /* key exchange */ unsigned is_symmetric:1; unsigned is_pk:1; int digest_size; @@ -73,6 +75,7 @@ struct key_item_st { union { rsa_key rsa; dsa_key dsa; + dh_key dh; } pk; } key; @@ -107,7 +110,11 @@ void ncr_deinit_lists(struct ncr_lists *lst); int ncr_ioctl(struct ncr_lists*, struct file *filp, unsigned int cmd, unsigned long arg); - + +/* key derivation */ +int ncr_key_derive(struct list_sem_st* key_lst, void __user* arg); + +/* key handling */ int ncr_key_init(struct list_sem_st*, void __user* arg); int ncr_key_deinit(struct list_sem_st*, void __user* arg); int ncr_key_export(struct list_sem_st* key_lst,void __user* arg); |