diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 22:05:18 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 22:05:18 +0400 |
commit | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (patch) | |
tree | c5b9258be43d7f4e2ec1d91e4b83820562fbaebb /include/linux | |
parent | 04012e3076943f17c8cfc77a196701c8f0b8964f (diff) | |
parent | e70308ec0e4bff344fcfdf160de40e1150552c5f (diff) | |
download | linux-b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes a memory corruption issue in caam, as well as
reverting the new optimised crct10dif implementation as it breaks boot
on initrd systems.
Hopefully crct10dif will be reinstated once the supporting code is
added so that it doesn't break boot"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
crypto: caam - Fixed the memory out of bound overwrite issue
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/crc-t10dif.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/crc-t10dif.h b/include/linux/crc-t10dif.h index b3cb71f0d3b0..a9c96d865ee7 100644 --- a/include/linux/crc-t10dif.h +++ b/include/linux/crc-t10dif.h @@ -3,10 +3,6 @@ #include <linux/types.h> -#define CRC_T10DIF_DIGEST_SIZE 2 -#define CRC_T10DIF_BLOCK_SIZE 1 - -__u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer, size_t len); __u16 crc_t10dif(unsigned char const *, size_t); #endif |