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

Commit afbac17e authored by Cyrille Pitchen's avatar Cyrille Pitchen Committed by Herbert Xu
Browse files

crypto: atmel-aes - fix typo and indentation 



Dummy patch to fix typo and indentation.

Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@atmel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2bfd04cd

drivers/crypto/atmel-aes.c

+25 −31
Original line number Diff line number Diff line
@@ -94,10 +94,8 @@ typedef int (*atmel_aes_fn_t)(struct atmel_aes_dev *); 
struct atmel_aes_base_ctx {

	struct atmel_aes_dev	*dd;

	atmel_aes_fn_t		start;



	int			keylen;

	u32			key[AES_KEYSIZE_256 / sizeof(u32)];



	u16			block_size;

};
@@ -782,11 +780,11 @@ static void atmel_aes_buff_cleanup(struct atmel_aes_dev *dd) 


static int atmel_aes_crypt(struct ablkcipher_request *req, unsigned long mode)

{

	struct atmel_aes_base_ctx *ctx = crypto_ablkcipher_ctx(

			crypto_ablkcipher_reqtfm(req));

	struct atmel_aes_reqctx *rctx = ablkcipher_request_ctx(req);

	struct atmel_aes_base_ctx *ctx;

	struct atmel_aes_reqctx *rctx;

	struct atmel_aes_dev *dd;



	ctx = crypto_ablkcipher_ctx(crypto_ablkcipher_reqtfm(req));

	switch (mode & AES_FLAGS_OPMODE_MASK) {

	case AES_FLAGS_CFB8:

		ctx->block_size = CFB8_BLOCK_SIZE;
@@ -813,6 +811,7 @@ static int atmel_aes_crypt(struct ablkcipher_request *req, unsigned long mode) 
	if (!dd)

		return -ENODEV;



	rctx = ablkcipher_request_ctx(req);

	rctx->mode = mode;



	return atmel_aes_handle_queue(dd, &req->base);
@@ -873,7 +872,8 @@ static int atmel_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key, 
{

	struct atmel_aes_base_ctx *ctx = crypto_ablkcipher_ctx(tfm);



	if (keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_192 &&

	if (keylen != AES_KEYSIZE_128 &&

	    keylen != AES_KEYSIZE_192 &&

	    keylen != AES_KEYSIZE_256) {

		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);

		return -EINVAL;
@@ -897,26 +897,22 @@ static int atmel_aes_ecb_decrypt(struct ablkcipher_request *req) 


static int atmel_aes_cbc_encrypt(struct ablkcipher_request *req)

{

	return atmel_aes_crypt(req,

		AES_FLAGS_ENCRYPT | AES_FLAGS_CBC);

	return atmel_aes_crypt(req, AES_FLAGS_CBC | AES_FLAGS_ENCRYPT);

}



static int atmel_aes_cbc_decrypt(struct ablkcipher_request *req)

{

	return atmel_aes_crypt(req,

		AES_FLAGS_CBC);

	return atmel_aes_crypt(req, AES_FLAGS_CBC);

}



static int atmel_aes_ofb_encrypt(struct ablkcipher_request *req)

{

	return atmel_aes_crypt(req,

		AES_FLAGS_ENCRYPT | AES_FLAGS_OFB);

	return atmel_aes_crypt(req, AES_FLAGS_OFB | AES_FLAGS_ENCRYPT);

}



static int atmel_aes_ofb_decrypt(struct ablkcipher_request *req)

{

	return atmel_aes_crypt(req,

		AES_FLAGS_OFB);

	return atmel_aes_crypt(req, AES_FLAGS_OFB);

}



static int atmel_aes_cfb_encrypt(struct ablkcipher_request *req)
@@ -971,14 +967,12 @@ static int atmel_aes_cfb8_decrypt(struct ablkcipher_request *req) 


static int atmel_aes_ctr_encrypt(struct ablkcipher_request *req)

{

	return atmel_aes_crypt(req,

		AES_FLAGS_ENCRYPT | AES_FLAGS_CTR);

	return atmel_aes_crypt(req, AES_FLAGS_CTR | AES_FLAGS_ENCRYPT);

}



static int atmel_aes_ctr_decrypt(struct ablkcipher_request *req)

{

	return atmel_aes_crypt(req,

		AES_FLAGS_CTR);

	return atmel_aes_crypt(req, AES_FLAGS_CTR);

}



static int atmel_aes_cra_init(struct crypto_tfm *tfm)