diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 15:00:17 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 15:00:17 +0200 |
| commit | c61c13594953d462597ed18d6c77e736878ff9d9 (patch) | |
| tree | 583b7cb956cb9fce6c630cc634e772942e3bbaf7 /include/linux/ncr.h | |
| parent | 9cab3a1a9660ed5f798b063aa7e827eb0c95ba94 (diff) | |
| parent | 8afc069c742f80d3e383ba3d0e38697aeeeb147b (diff) | |
| download | kernel-crypto-ncr-standalone-rename.tar.gz kernel-crypto-ncr-standalone-rename.tar.xz kernel-crypto-ncr-standalone-rename.zip | |
Merge branch 'standalone-master' into standalone-renamencr-standalone-rename
Conflicts:
crypto/userspace/libtomcrypt/misc/qsort.c
crypto/userspace/libtommath/bn_mp_and.c
crypto/userspace/libtommath/bn_mp_exteuclid.c
crypto/userspace/libtommath/bn_mp_jacobi.c
crypto/userspace/libtommath/bn_mp_or.c
crypto/userspace/libtommath/bn_mp_prime_fermat.c
crypto/userspace/libtommath/bn_mp_radix_size.c
crypto/userspace/libtommath/bn_mp_radix_smap.c
crypto/userspace/libtommath/bn_mp_read_radix.c
crypto/userspace/libtommath/bn_mp_sqrt.c
crypto/userspace/libtommath/bn_mp_toradix.c
crypto/userspace/libtommath/bn_mp_toradix_n.c
crypto/userspace/libtommath/bn_mp_xor.c
examples/Makefile
examples/ncr.c
examples/pk.c
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 ce84f7a7f85..e4500b9c0d7 100644 --- a/include/linux/ncr.h +++ b/include/linux/ncr.h @@ -106,6 +106,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; |