diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 19:50:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 19:50:02 -0500 |
| commit | 37d4008484977f60d5d37499a2670c79b214dd46 (patch) | |
| tree | e73ef4b7c3eee1543e13d7be2ecb1593e77eb123 /crypto/aead.c | |
| parent | 68c6b859846bd078b37c6ca5f3882032f129e72d (diff) | |
| parent | 8d0c123f8b710561cfd34f6e1a5bebc27988edbe (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: (31 commits)
crypto: aes_generic - Fix checkpatch errors
crypto: fcrypt - Fix checkpatch errors
crypto: ecb - Fix checkpatch errors
crypto: des_generic - Fix checkpatch errors
crypto: deflate - Fix checkpatch errors
crypto: crypto_null - Fix checkpatch errors
crypto: cipher - Fix checkpatch errors
crypto: crc32 - Fix checkpatch errors
crypto: compress - Fix checkpatch errors
crypto: cast6 - Fix checkpatch errors
crypto: cast5 - Fix checkpatch errors
crypto: camellia - Fix checkpatch errors
crypto: authenc - Fix checkpatch errors
crypto: api - Fix checkpatch errors
crypto: anubis - Fix checkpatch errors
crypto: algapi - Fix checkpatch errors
crypto: blowfish - Fix checkpatch errors
crypto: aead - Fix checkpatch errors
crypto: ablkcipher - Fix checkpatch errors
crypto: pcrypt - call the complete function on error
...
Diffstat (limited to 'crypto/aead.c')
| -rw-r--r-- | crypto/aead.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/aead.c b/crypto/aead.c index 0a55da70845e..6729e8ff68e7 100644 --- a/crypto/aead.c +++ b/crypto/aead.c | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * AEAD: Authenticated Encryption with Associated Data | 2 | * AEAD: Authenticated Encryption with Associated Data |
| 3 | * | 3 | * |
| 4 | * This file provides API support for AEAD algorithms. | 4 | * This file provides API support for AEAD algorithms. |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2007 Herbert Xu <herbert@gondor.apana.org.au> | 6 | * Copyright (c) 2007 Herbert Xu <herbert@gondor.apana.org.au> |
| 7 | * | 7 | * |
| 8 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
| 9 | * under the terms of the GNU General Public License as published by the Free | 9 | * under the terms of the GNU General Public License as published by the Free |
| 10 | * Software Foundation; either version 2 of the License, or (at your option) | 10 | * Software Foundation; either version 2 of the License, or (at your option) |
| 11 | * any later version. | 11 | * any later version. |
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |