diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 15:00:42 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 15:00:42 +0200 |
| commit | 0f981ee35028602b9e60ac82b07d54972f6f7331 (patch) | |
| tree | f8d6df4535fba1fd45dc8b33fb2c8ec03b3956f5 /include/linux/ncr.h | |
| parent | 5d08c95e8a0101f156cf1afe8b2fae8487d1cfce (diff) | |
| parent | c61c13594953d462597ed18d6c77e736878ff9d9 (diff) | |
| download | kernel-crypto-0f981ee35028602b9e60ac82b07d54972f6f7331.tar.gz kernel-crypto-0f981ee35028602b9e60ac82b07d54972f6f7331.tar.xz kernel-crypto-0f981ee35028602b9e60ac82b07d54972f6f7331.zip | |
Merge branch 'standalone-rename' into userspace-cryptoncr-userspace-crypto
Diffstat (limited to 'include/linux/ncr.h')
| -rw-r--r-- | include/linux/ncr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ncr.h b/include/linux/ncr.h index 4f4d8a957ac..cd18d4b6a9a 100644 --- a/include/linux/ncr.h +++ b/include/linux/ncr.h @@ -103,6 +103,8 @@ typedef __s32 ncr_key_t; */ #define NCR_KEY_FLAG_WRAPPING (1<<6) #define NCR_KEY_FLAG_UNWRAPPING (1<<7) +#define NCR_KEY_FLAG_HASHABLE (1<<8) +#define NCR_KEY_FLAG_ALLOW_TRANSPARENT_HASH (1<<9) struct ncr_key_generate { __u32 input_size, output_size; |