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 ...
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 /arch/s390
parent: 68c6b859846bd078b37c6ca5f3882032f129e72d (diff)
parent: 8d0c123f8b710561cfd34f6e1a5bebc27988edbe (diff)
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index 6be4503201ac..58f46734465f 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -78,14 +78,14 @@ static int setkey_fallback_cip(struct crypto_tfm *tfm, const u8 *in_key,
        struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
        int ret;
-        sctx->fallback.blk->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;
+        sctx->fallback.cip->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;
-        sctx->fallback.blk->base.crt_flags |= (tfm->crt_flags &
+        sctx->fallback.cip->base.crt_flags |= (tfm->crt_flags &
                        CRYPTO_TFM_REQ_MASK);
        ret = crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len);
        if (ret) {
                tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;
-                tfm->crt_flags |= (sctx->fallback.blk->base.crt_flags &
+                tfm->crt_flags |= (sctx->fallback.cip->base.crt_flags &
                                CRYPTO_TFM_RES_MASK);
        }
        return ret;
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 /arch/s390
parent	68c6b859846bd078b37c6ca5f3882032f129e72d (diff)
parent	8d0c123f8b710561cfd34f6e1a5bebc27988edbe (diff)

diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c index 6be4503201ac..58f46734465f 100644 --- a/arch/s390/crypto/aes_s390.c +++ b/arch/s390/crypto/aes_s390.c
@@ -78,14 +78,14 @@ static int setkey_fallback_cip(struct crypto_tfm tfm, const u8 in_key,
78	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);	78	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
79	int ret;	79	int ret;
80		80
81	sctx->fallback.blk->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;	81	sctx->fallback.cip->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;
82	sctx->fallback.blk->base.crt_flags \|= (tfm->crt_flags &	82	sctx->fallback.cip->base.crt_flags \|= (tfm->crt_flags &
83	CRYPTO_TFM_REQ_MASK);	83	CRYPTO_TFM_REQ_MASK);
84		84
85	ret = crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len);	85	ret = crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len);
86	if (ret) {	86	if (ret) {
87	tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;	87	tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;
88	tfm->crt_flags \|= (sctx->fallback.blk->base.crt_flags &	88	tfm->crt_flags \|= (sctx->fallback.cip->base.crt_flags &
89	CRYPTO_TFM_RES_MASK);	89	CRYPTO_TFM_RES_MASK);
90	}	90	}
91	return ret;	91	return ret;