diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 16:50:02 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 16:50:02 -0800 |
commit | 378a52b7bda6de62fdb56ca38e97439d02f61343 (patch) | |
tree | 033e540e7a2efdb38a6f0a7ba7cf623a461b6c5b /crypto/crypto_null.c | |
parent | 39fa904443d5fef09dfeb90b94ec9892a5a96a35 (diff) | |
parent | ab05e4cdaf304c0ce7bc82eaa9bc263c79f7817b (diff) | |
download | linux-crypto-378a52b7bda6de62fdb56ca38e97439d02f61343.tar.gz linux-crypto-378a52b7bda6de62fdb56ca38e97439d02f61343.zip |
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 '')
-rw-r--r-- | crypto/crypto_null.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c index cb71c912..07a8a96d 100644 --- a/crypto/crypto_null.c +++ b/crypto/crypto_null.c @@ -1,11 +1,11 @@ -/* +/* * Cryptographic API. * * Null algorithms, aka Much Ado About Nothing. * * These are needed for IPsec, and may be useful in general for * testing & debugging. - * + * * The null cipher is compliant with RFC2410. * * Copyright (c) 2002 James Morris <jmorris@intercode.com.au> @@ -163,7 +163,7 @@ MODULE_ALIAS("cipher_null"); static int __init crypto_null_mod_init(void) { int ret = 0; - + ret = crypto_register_alg(&cipher_null); if (ret < 0) goto out; @@ -180,7 +180,7 @@ static int __init crypto_null_mod_init(void) if (ret < 0) goto out_unregister_digest; -out: +out: return ret; out_unregister_digest: |