diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-11 19:14:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-11 19:14:17 -0400 |
| commit | 274a2f5ddb3e8bf67e561574e6529a65a4039240 (patch) | |
| tree | c0a7e840a98628ce7eff8dc307a3cdcb9cd33d1a /drivers/crypto | |
| parent | 2a1497c3c4e884d6886e13741d0ba1abd2631006 (diff) | |
| parent | 9b2f4cb65f7083cde86553cd56d6c2878e04932a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the authenc self-test crash as well as a missing export of
a symbol used by a module."
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: authenc - Fix crash with zero-length assoc data
crypto/caam: Export gen_split_key symbol for other modules
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/caam/key_gen.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/caam/key_gen.c b/drivers/crypto/caam/key_gen.c index 002888185f17..d216cd3cc569 100644 --- a/drivers/crypto/caam/key_gen.c +++ b/drivers/crypto/caam/key_gen.c | |||
| @@ -120,3 +120,4 @@ u32 gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len, | |||
| 120 | 120 | ||
| 121 | return ret; | 121 | return ret; |
| 122 | } | 122 | } |
| 123 | EXPORT_SYMBOL(gen_split_key); | ||