diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-31 00:16:54 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-31 00:16:54 +0200 |
| commit | dbff0a8826b2dd9abc0c7699ae883a95d468b12c (patch) | |
| tree | d6f9028ade424c14cd21fd41ae21a7f417af978d /include | |
| parent | d5c2b894102e59efe499c231a32065afcf37e463 (diff) | |
| parent | af51c84e19753ec0c9de368816a30bcc4fb90c24 (diff) | |
| download | kernel-crypto-dbff0a8826b2dd9abc0c7699ae883a95d468b12c.tar.gz kernel-crypto-dbff0a8826b2dd9abc0c7699ae883a95d468b12c.tar.xz kernel-crypto-dbff0a8826b2dd9abc0c7699ae883a95d468b12c.zip | |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
AUTHORS
README
TODO
userspace/setkey.c
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 01fd4131187..53c77be865f 100644 --- a/include/linux/ncr.h +++ b/include/linux/ncr.h @@ -7,7 +7,6 @@ #endif #define NCR_CIPHER_MAX_BLOCK_LEN 32 -#define NCR_CIPHER_MAX_KEY_LEN 512 #define NCR_HASH_MAX_OUTPUT_SIZE 64 typedef enum { @@ -221,7 +220,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; }; |