diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-31 00:17:20 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-31 00:17:20 +0200 |
| commit | 682bdfb751e081a6633c78a2cf20e2d81a2ca03c (patch) | |
| tree | a39596e2b91e9679c08333f2e9ba7b95a071aac8 /include | |
| parent | e6b93d8a7e1d3d4a3d76312fc84319ff6d596067 (diff) | |
| parent | dbff0a8826b2dd9abc0c7699ae883a95d468b12c (diff) | |
| download | kernel-crypto-682bdfb751e081a6633c78a2cf20e2d81a2ca03c.tar.gz kernel-crypto-682bdfb751e081a6633c78a2cf20e2d81a2ca03c.tar.xz kernel-crypto-682bdfb751e081a6633c78a2cf20e2d81a2ca03c.zip | |
Merge branch 'standalone-rename' into userspace-crypto
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ncr.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/ncr.h b/include/linux/ncr.h index e74c95d3231..9b96a038ff5 100644 --- a/include/linux/ncr.h +++ b/include/linux/ncr.h @@ -4,7 +4,6 @@ #include <linux/types.h> #define NCR_CIPHER_MAX_BLOCK_LEN 32 -#define NCR_CIPHER_MAX_KEY_LEN 512 #define NCR_HASH_MAX_OUTPUT_SIZE 64 typedef enum { @@ -218,7 +217,7 @@ struct ncr_key_wrap_st { /* Internal ops */ struct ncr_master_key_st { - uint8_t key[NCR_CIPHER_MAX_KEY_LEN]; + uint8_t __user * key; uint16_t key_size; }; |