Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df89820e authored by Herbert Xu's avatar Herbert Xu
Browse files

[CRYPTO] cipher: Removed special IV checks for ECB 



This patch makes IV operations on ECB fail through nocrypt_iv rather than
calling BUG().  This is needed to generalise CBC/ECB using the template
mechanism.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c907ee76

crypto/cipher.c

+2 −0
Original line number Diff line number Diff line
@@ -399,6 +399,8 @@ int crypto_init_cipher_ops(struct crypto_tfm *tfm) 
	case CRYPTO_TFM_MODE_ECB:

		ops->cit_encrypt = ecb_encrypt;

		ops->cit_decrypt = ecb_decrypt;

		ops->cit_encrypt_iv = nocrypt_iv;

		ops->cit_decrypt_iv = nocrypt_iv;

		break;

		

	case CRYPTO_TFM_MODE_CBC:

include/linux/crypto.h

+0 −2
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm, 
                                           unsigned int nbytes, u8 *iv)

{

	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);

	BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);

	return tfm->crt_cipher.cit_encrypt_iv(tfm, dst, src, nbytes, iv);

}
@@ -441,7 +440,6 @@ static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm, 
                                           unsigned int nbytes, u8 *iv)

{

	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);

	BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);

	return tfm->crt_cipher.cit_decrypt_iv(tfm, dst, src, nbytes, iv);

}