diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 12:55:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 12:55:56 -0500 |
| commit | c0caf7bcbfedb3f79ccec759b221bfef0646ada3 (patch) | |
| tree | 53c4b5850b18a60e7feef1d10b255a18279cdbee /drivers/crypto | |
| parent | c22cff08db00ef0411be088956d7934681a1f988 (diff) | |
| parent | c054a076a1bd4731820a9c4d638b13d5c9bf5935 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: padlock - Fix AES-CBC handling on odd-block-sized input
crypto: n2 - dubious error check
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/n2_core.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/padlock-aes.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c index 88ee01510ec0..76141262ea1d 100644 --- a/drivers/crypto/n2_core.c +++ b/drivers/crypto/n2_core.c | |||
| @@ -1832,7 +1832,7 @@ static int __devinit get_irq_props(struct mdesc_handle *mdesc, u64 node, | |||
| 1832 | return -ENODEV; | 1832 | return -ENODEV; |
| 1833 | 1833 | ||
| 1834 | ino = mdesc_get_property(mdesc, node, "ino", &ino_len); | 1834 | ino = mdesc_get_property(mdesc, node, "ino", &ino_len); |
| 1835 | if (!intr) | 1835 | if (!ino) |
| 1836 | return -ENODEV; | 1836 | return -ENODEV; |
| 1837 | 1837 | ||
| 1838 | if (intr_len != ino_len) | 1838 | if (intr_len != ino_len) |
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index 2e992bc8015b..8a515baa38f7 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c | |||
| @@ -286,7 +286,7 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key, | |||
| 286 | if (initial) | 286 | if (initial) |
| 287 | asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ | 287 | asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ |
| 288 | : "+S" (input), "+D" (output), "+a" (iv) | 288 | : "+S" (input), "+D" (output), "+a" (iv) |
| 289 | : "d" (control_word), "b" (key), "c" (count)); | 289 | : "d" (control_word), "b" (key), "c" (initial)); |
| 290 | 290 | ||
| 291 | asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ | 291 | asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ |
| 292 | : "+S" (input), "+D" (output), "+a" (iv) | 292 | : "+S" (input), "+D" (output), "+a" (iv) |