Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (34bef46e) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/crypto/nx/nx-aes-ccm.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -494,8 +494,9 @@ static int ccm_nx_encrypt(struct aead_request *req,
	static int ccm4309_aes_nx_encrypt(struct aead_request *req)		static int ccm4309_aes_nx_encrypt(struct aead_request *req)
	{		{
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);		struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
			struct nx_gcm_rctx *rctx = aead_request_ctx(req);
	struct blkcipher_desc desc;		struct blkcipher_desc desc;
	u8 *iv = nx_ctx->priv.ccm.iv;		u8 *iv = rctx->iv;

	iv[0] = 3;		iv[0] = 3;
	memcpy(iv + 1, nx_ctx->priv.ccm.nonce, 3);		memcpy(iv + 1, nx_ctx->priv.ccm.nonce, 3);
	@@ -525,8 +526,9 @@ static int ccm_aes_nx_encrypt(struct aead_request *req)
	static int ccm4309_aes_nx_decrypt(struct aead_request *req)		static int ccm4309_aes_nx_decrypt(struct aead_request *req)
	{		{
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);		struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
			struct nx_gcm_rctx *rctx = aead_request_ctx(req);
	struct blkcipher_desc desc;		struct blkcipher_desc desc;
	u8 *iv = nx_ctx->priv.ccm.iv;		u8 *iv = rctx->iv;

	iv[0] = 3;		iv[0] = 3;
	memcpy(iv + 1, nx_ctx->priv.ccm.nonce, 3);		memcpy(iv + 1, nx_ctx->priv.ccm.nonce, 3);

drivers/crypto/nx/nx-aes-ctr.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,7 @@ static int ctr3686_aes_nx_set_key(struct crypto_tfm *tfm,
	if (key_len < CTR_RFC3686_NONCE_SIZE)		if (key_len < CTR_RFC3686_NONCE_SIZE)
	return -EINVAL;		return -EINVAL;

	memcpy(nx_ctx->priv.ctr.iv,		memcpy(nx_ctx->priv.ctr.nonce,
	in_key + key_len - CTR_RFC3686_NONCE_SIZE,		in_key + key_len - CTR_RFC3686_NONCE_SIZE,
	CTR_RFC3686_NONCE_SIZE);		CTR_RFC3686_NONCE_SIZE);

	@@ -131,14 +131,15 @@ static int ctr3686_aes_nx_crypt(struct blkcipher_desc *desc,
	unsigned int nbytes)		unsigned int nbytes)
	{		{
	struct nx_crypto_ctx *nx_ctx = crypto_blkcipher_ctx(desc->tfm);		struct nx_crypto_ctx *nx_ctx = crypto_blkcipher_ctx(desc->tfm);
	u8 *iv = nx_ctx->priv.ctr.iv;		u8 iv[16];

			memcpy(iv, nx_ctx->priv.ctr.nonce, CTR_RFC3686_IV_SIZE);
	memcpy(iv + CTR_RFC3686_NONCE_SIZE,		memcpy(iv + CTR_RFC3686_NONCE_SIZE,
	desc->info, CTR_RFC3686_IV_SIZE);		desc->info, CTR_RFC3686_IV_SIZE);
	iv[12] = iv[13] = iv[14] = 0;		iv[12] = iv[13] = iv[14] = 0;
	iv[15] = 1;		iv[15] = 1;

	desc->info = nx_ctx->priv.ctr.iv;		desc->info = iv;

	return ctr_aes_nx_crypt(desc, dst, src, nbytes);		return ctr_aes_nx_crypt(desc, dst, src, nbytes);
	}		}

drivers/crypto/nx/nx-aes-gcm.c

+10 −7

Original line number	Original line	Diff line number	Diff line
	@@ -317,6 +317,7 @@ static int gcm_empty(struct aead_request req, struct blkcipher_desc desc,
	static int gcm_aes_nx_crypt(struct aead_request *req, int enc)		static int gcm_aes_nx_crypt(struct aead_request *req, int enc)
	{		{
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);		struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
			struct nx_gcm_rctx *rctx = aead_request_ctx(req);
	struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;		struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
	struct blkcipher_desc desc;		struct blkcipher_desc desc;
	unsigned int nbytes = req->cryptlen;		unsigned int nbytes = req->cryptlen;
	@@ -326,7 +327,7 @@ static int gcm_aes_nx_crypt(struct aead_request *req, int enc)

	spin_lock_irqsave(&nx_ctx->lock, irq_flags);		spin_lock_irqsave(&nx_ctx->lock, irq_flags);

	desc.info = nx_ctx->priv.gcm.iv;		desc.info = rctx->iv;
	/* initialize the counter */		/* initialize the counter */
	(u32 )(desc.info + NX_GCM_CTR_OFFSET) = 1;		(u32 )(desc.info + NX_GCM_CTR_OFFSET) = 1;

	@@ -424,8 +425,8 @@ static int gcm_aes_nx_crypt(struct aead_request *req, int enc)

	static int gcm_aes_nx_encrypt(struct aead_request *req)		static int gcm_aes_nx_encrypt(struct aead_request *req)
	{		{
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);		struct nx_gcm_rctx *rctx = aead_request_ctx(req);
	char *iv = nx_ctx->priv.gcm.iv;		char *iv = rctx->iv;

	memcpy(iv, req->iv, 12);		memcpy(iv, req->iv, 12);

	@@ -434,8 +435,8 @@ static int gcm_aes_nx_encrypt(struct aead_request *req)

	static int gcm_aes_nx_decrypt(struct aead_request *req)		static int gcm_aes_nx_decrypt(struct aead_request *req)
	{		{
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);		struct nx_gcm_rctx *rctx = aead_request_ctx(req);
	char *iv = nx_ctx->priv.gcm.iv;		char *iv = rctx->iv;

	memcpy(iv, req->iv, 12);		memcpy(iv, req->iv, 12);

	@@ -445,7 +446,8 @@ static int gcm_aes_nx_decrypt(struct aead_request *req)
	static int gcm4106_aes_nx_encrypt(struct aead_request *req)		static int gcm4106_aes_nx_encrypt(struct aead_request *req)
	{		{
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);		struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
	char *iv = nx_ctx->priv.gcm.iv;		struct nx_gcm_rctx *rctx = aead_request_ctx(req);
			char *iv = rctx->iv;
	char *nonce = nx_ctx->priv.gcm.nonce;		char *nonce = nx_ctx->priv.gcm.nonce;

	memcpy(iv, nonce, NX_GCM4106_NONCE_LEN);		memcpy(iv, nonce, NX_GCM4106_NONCE_LEN);
	@@ -457,7 +459,8 @@ static int gcm4106_aes_nx_encrypt(struct aead_request *req)
	static int gcm4106_aes_nx_decrypt(struct aead_request *req)		static int gcm4106_aes_nx_decrypt(struct aead_request *req)
	{		{
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);		struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
	char *iv = nx_ctx->priv.gcm.iv;		struct nx_gcm_rctx *rctx = aead_request_ctx(req);
			char *iv = rctx->iv;
	char *nonce = nx_ctx->priv.gcm.nonce;		char *nonce = nx_ctx->priv.gcm.nonce;

	memcpy(iv, nonce, NX_GCM4106_NONCE_LEN);		memcpy(iv, nonce, NX_GCM4106_NONCE_LEN);

drivers/crypto/nx/nx-aes-xcbc.c

+44 −26

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,7 @@ static int nx_xcbc_set_key(struct crypto_shash *desc,
	unsigned int key_len)		unsigned int key_len)
	{		{
	struct nx_crypto_ctx *nx_ctx = crypto_shash_ctx(desc);		struct nx_crypto_ctx *nx_ctx = crypto_shash_ctx(desc);
			struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;

	switch (key_len) {		switch (key_len) {
	case AES_KEYSIZE_128:		case AES_KEYSIZE_128:
	@@ -51,7 +52,7 @@ static int nx_xcbc_set_key(struct crypto_shash *desc,
	return -EINVAL;		return -EINVAL;
	}		}

	memcpy(nx_ctx->priv.xcbc.key, in_key, key_len);		memcpy(csbcpb->cpb.aes_xcbc.key, in_key, key_len);

	return 0;		return 0;
	}		}
	@@ -148,32 +149,29 @@ static int nx_xcbc_empty(struct shash_desc desc, u8 out)
	return rc;		return rc;
	}		}

	static int nx_xcbc_init(struct shash_desc *desc)		static int nx_crypto_ctx_aes_xcbc_init2(struct crypto_tfm *tfm)
	{		{
	struct xcbc_state *sctx = shash_desc_ctx(desc);		struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(tfm);
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(&desc->tfm->base);
	struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;		struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
	struct nx_sg *out_sg;		int err;
	int len;

	nx_ctx_init(nx_ctx, HCOP_FC_AES);		err = nx_crypto_ctx_aes_xcbc_init(tfm);
			if (err)
			return err;

	memset(sctx, 0, sizeof *sctx);		nx_ctx_init(nx_ctx, HCOP_FC_AES);

	NX_CPB_SET_KEY_SIZE(csbcpb, NX_KS_AES_128);		NX_CPB_SET_KEY_SIZE(csbcpb, NX_KS_AES_128);
	csbcpb->cpb.hdr.mode = NX_MODE_AES_XCBC_MAC;		csbcpb->cpb.hdr.mode = NX_MODE_AES_XCBC_MAC;

	memcpy(csbcpb->cpb.aes_xcbc.key, nx_ctx->priv.xcbc.key, AES_BLOCK_SIZE);		return 0;
	memset(nx_ctx->priv.xcbc.key, 0, sizeof *nx_ctx->priv.xcbc.key);		}

	len = AES_BLOCK_SIZE;
	out_sg = nx_build_sg_list(nx_ctx->out_sg, (u8 *)sctx->state,
	&len, nx_ctx->ap->sglen);

	if (len != AES_BLOCK_SIZE)		static int nx_xcbc_init(struct shash_desc *desc)
	return -EINVAL;		{
			struct xcbc_state *sctx = shash_desc_ctx(desc);

	nx_ctx->op.outlen = (nx_ctx->out_sg - out_sg) * sizeof(struct nx_sg);		memset(sctx, 0, sizeof *sctx);

	return 0;		return 0;
	}		}
	@@ -186,6 +184,7 @@ static int nx_xcbc_update(struct shash_desc *desc,
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(&desc->tfm->base);		struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(&desc->tfm->base);
	struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;		struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
	struct nx_sg *in_sg;		struct nx_sg *in_sg;
			struct nx_sg *out_sg;
	u32 to_process = 0, leftover, total;		u32 to_process = 0, leftover, total;
	unsigned int max_sg_len;		unsigned int max_sg_len;
	unsigned long irq_flags;		unsigned long irq_flags;
	@@ -213,6 +212,17 @@ static int nx_xcbc_update(struct shash_desc *desc,
	max_sg_len = min_t(u64, max_sg_len,		max_sg_len = min_t(u64, max_sg_len,
	nx_ctx->ap->databytelen/NX_PAGE_SIZE);		nx_ctx->ap->databytelen/NX_PAGE_SIZE);

			data_len = AES_BLOCK_SIZE;
			out_sg = nx_build_sg_list(nx_ctx->out_sg, (u8 *)sctx->state,
			&len, nx_ctx->ap->sglen);

			if (data_len != AES_BLOCK_SIZE) {
			rc = -EINVAL;
			goto out;
			}

			nx_ctx->op.outlen = (nx_ctx->out_sg - out_sg) * sizeof(struct nx_sg);

	do {		do {
	to_process = total - to_process;		to_process = total - to_process;
	to_process = to_process & ~(AES_BLOCK_SIZE - 1);		to_process = to_process & ~(AES_BLOCK_SIZE - 1);
	@@ -235,8 +245,10 @@ static int nx_xcbc_update(struct shash_desc *desc,
	(u8 *) sctx->buffer,		(u8 *) sctx->buffer,
	&data_len,		&data_len,
	max_sg_len);		max_sg_len);
	if (data_len != sctx->count)		if (data_len != sctx->count) {
	return -EINVAL;		rc = -EINVAL;
			goto out;
			}
	}		}

	data_len = to_process - sctx->count;		data_len = to_process - sctx->count;
	@@ -245,8 +257,10 @@ static int nx_xcbc_update(struct shash_desc *desc,
	&data_len,		&data_len,
	max_sg_len);		max_sg_len);

	if (data_len != to_process - sctx->count)		if (data_len != to_process - sctx->count) {
	return -EINVAL;		rc = -EINVAL;
			goto out;
			}

	nx_ctx->op.inlen = (nx_ctx->in_sg - in_sg) *		nx_ctx->op.inlen = (nx_ctx->in_sg - in_sg) *
	sizeof(struct nx_sg);		sizeof(struct nx_sg);
	@@ -325,15 +339,19 @@ static int nx_xcbc_final(struct shash_desc desc, u8 out)
	in_sg = nx_build_sg_list(nx_ctx->in_sg, (u8 *)sctx->buffer,		in_sg = nx_build_sg_list(nx_ctx->in_sg, (u8 *)sctx->buffer,
	&len, nx_ctx->ap->sglen);		&len, nx_ctx->ap->sglen);

	if (len != sctx->count)		if (len != sctx->count) {
	return -EINVAL;		rc = -EINVAL;
			goto out;
			}

	len = AES_BLOCK_SIZE;		len = AES_BLOCK_SIZE;
	out_sg = nx_build_sg_list(nx_ctx->out_sg, out, &len,		out_sg = nx_build_sg_list(nx_ctx->out_sg, out, &len,
	nx_ctx->ap->sglen);		nx_ctx->ap->sglen);

	if (len != AES_BLOCK_SIZE)		if (len != AES_BLOCK_SIZE) {
	return -EINVAL;		rc = -EINVAL;
			goto out;
			}

	nx_ctx->op.inlen = (nx_ctx->in_sg - in_sg) * sizeof(struct nx_sg);		nx_ctx->op.inlen = (nx_ctx->in_sg - in_sg) * sizeof(struct nx_sg);
	nx_ctx->op.outlen = (nx_ctx->out_sg - out_sg) * sizeof(struct nx_sg);		nx_ctx->op.outlen = (nx_ctx->out_sg - out_sg) * sizeof(struct nx_sg);
	@@ -372,7 +390,7 @@ struct shash_alg nx_shash_aes_xcbc_alg = {
	.cra_blocksize = AES_BLOCK_SIZE,		.cra_blocksize = AES_BLOCK_SIZE,
	.cra_module = THIS_MODULE,		.cra_module = THIS_MODULE,
	.cra_ctxsize = sizeof(struct nx_crypto_ctx),		.cra_ctxsize = sizeof(struct nx_crypto_ctx),
	.cra_init = nx_crypto_ctx_aes_xcbc_init,		.cra_init = nx_crypto_ctx_aes_xcbc_init2,
	.cra_exit = nx_crypto_ctx_exit,		.cra_exit = nx_crypto_ctx_exit,
	}		}
	};		};

drivers/crypto/nx/nx-sha256.c

+24 −19

Original line number	Original line	Diff line number	Diff line
	@@ -29,34 +29,28 @@
	#include "nx.h"		#include "nx.h"


	static int nx_sha256_init(struct shash_desc *desc)		static int nx_crypto_ctx_sha256_init(struct crypto_tfm *tfm)
	{		{
	struct sha256_state *sctx = shash_desc_ctx(desc);		struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(tfm);
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(&desc->tfm->base);		int err;
	struct nx_sg *out_sg;
	int len;
	u32 max_sg_len;

	nx_ctx_init(nx_ctx, HCOP_FC_SHA);		err = nx_crypto_ctx_sha_init(tfm);
			if (err)
			return err;

	memset(sctx, 0, sizeof *sctx);		nx_ctx_init(nx_ctx, HCOP_FC_SHA);

	nx_ctx->ap = &nx_ctx->props[NX_PROPS_SHA256];		nx_ctx->ap = &nx_ctx->props[NX_PROPS_SHA256];

	NX_CPB_SET_DIGEST_SIZE(nx_ctx->csbcpb, NX_DS_SHA256);		NX_CPB_SET_DIGEST_SIZE(nx_ctx->csbcpb, NX_DS_SHA256);

	max_sg_len = min_t(u64, nx_ctx->ap->sglen,		return 0;
	nx_driver.of.max_sg_len/sizeof(struct nx_sg));		}
	max_sg_len = min_t(u64, max_sg_len,
	nx_ctx->ap->databytelen/NX_PAGE_SIZE);

	len = SHA256_DIGEST_SIZE;		static int nx_sha256_init(struct shash_desc *desc) {
	out_sg = nx_build_sg_list(nx_ctx->out_sg, (u8 *)sctx->state,		struct sha256_state *sctx = shash_desc_ctx(desc);
	&len, max_sg_len);
	nx_ctx->op.outlen = (nx_ctx->out_sg - out_sg) * sizeof(struct nx_sg);

	if (len != SHA256_DIGEST_SIZE)		memset(sctx, 0, sizeof *sctx);
	return -EINVAL;

	sctx->state[0] = __cpu_to_be32(SHA256_H0);		sctx->state[0] = __cpu_to_be32(SHA256_H0);
	sctx->state[1] = __cpu_to_be32(SHA256_H1);		sctx->state[1] = __cpu_to_be32(SHA256_H1);
	@@ -78,6 +72,7 @@ static int nx_sha256_update(struct shash_desc desc, const u8 data,
	struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(&desc->tfm->base);		struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(&desc->tfm->base);
	struct nx_csbcpb csbcpb = (struct nx_csbcpb )nx_ctx->csbcpb;		struct nx_csbcpb csbcpb = (struct nx_csbcpb )nx_ctx->csbcpb;
	struct nx_sg *in_sg;		struct nx_sg *in_sg;
			struct nx_sg *out_sg;
	u64 to_process = 0, leftover, total;		u64 to_process = 0, leftover, total;
	unsigned long irq_flags;		unsigned long irq_flags;
	int rc = 0;		int rc = 0;
	@@ -108,6 +103,16 @@ static int nx_sha256_update(struct shash_desc desc, const u8 data,
	max_sg_len = min_t(u64, max_sg_len,		max_sg_len = min_t(u64, max_sg_len,
	nx_ctx->ap->databytelen/NX_PAGE_SIZE);		nx_ctx->ap->databytelen/NX_PAGE_SIZE);

			data_len = SHA256_DIGEST_SIZE;
			out_sg = nx_build_sg_list(nx_ctx->out_sg, (u8 *)sctx->state,
			&data_len, max_sg_len);
			nx_ctx->op.outlen = (nx_ctx->out_sg - out_sg) * sizeof(struct nx_sg);

			if (data_len != SHA256_DIGEST_SIZE) {
			rc = -EINVAL;
			goto out;
			}

	do {		do {
	/*		/*
	* to_process: the SHA256_BLOCK_SIZE data chunk to process in		* to_process: the SHA256_BLOCK_SIZE data chunk to process in
	@@ -282,7 +287,7 @@ struct shash_alg nx_shash_sha256_alg = {
	.cra_blocksize = SHA256_BLOCK_SIZE,		.cra_blocksize = SHA256_BLOCK_SIZE,
	.cra_module = THIS_MODULE,		.cra_module = THIS_MODULE,
	.cra_ctxsize = sizeof(struct nx_crypto_ctx),		.cra_ctxsize = sizeof(struct nx_crypto_ctx),
	.cra_init = nx_crypto_ctx_sha_init,		.cra_init = nx_crypto_ctx_sha256_init,
	.cra_exit = nx_crypto_ctx_exit,		.cra_exit = nx_crypto_ctx_exit,
	}		}
	};		};