diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-30 23:21:02 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-30 23:21:02 +0200 |
| commit | 67d0481e51b198cbad2b1d33389fd80e7a87dd46 (patch) | |
| tree | 91695a45a1f6ffb9e4ab53d6d6b1c34eb3dc25f2 /ncr-int.h | |
| parent | 517e0cc6199dcca54f8d20ebb90e304d4cc93c43 (diff) | |
| parent | af51c84e19753ec0c9de368816a30bcc4fb90c24 (diff) | |
| download | cryptodev-linux-67d0481e51b198cbad2b1d33389fd80e7a87dd46.tar.gz cryptodev-linux-67d0481e51b198cbad2b1d33389fd80e7a87dd46.tar.xz cryptodev-linux-67d0481e51b198cbad2b1d33389fd80e7a87dd46.zip | |
Merge branch 'master' into replace-lists
Conflicts:
ncr-int.h
ncr-key.c
ncr.c
Diffstat (limited to 'ncr-int.h')
| -rw-r--r-- | ncr-int.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -10,6 +10,7 @@ #include <ncr-dh.h> #define KEY_DATA_MAX_SIZE 3*1024 +#define NCR_CIPHER_MAX_KEY_LEN 1024 #define err() printk(KERN_DEBUG"ncr: %s: %s: %d\n", __FILE__, __func__, __LINE__) @@ -119,7 +120,6 @@ int ncr_key_generate(struct ncr_lists *lst, void __user* arg); int ncr_key_info(struct ncr_lists *lst, void __user* arg); int ncr_key_generate_pair(struct ncr_lists *lst, void __user* arg); -int ncr_key_derive(struct ncr_lists *lst, void __user* arg); int ncr_key_get_public(struct ncr_lists *lst, void __user* arg); int ncr_key_item_get_read(struct key_item_st**st, struct ncr_lists *lst, |