Commit 34cb5821 authored by Herbert Xu's avatar Herbert Xu
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Merge the crypto tree to pick up arm64 output IV patch.
parents 7dede913 7c2cf1c4

arch/arm64/crypto/aes-modes.S

+42 −46
Original line number Diff line number Diff line
@@ -193,15 +193,16 @@ AES_ENTRY(aes_cbc_encrypt) 
	cbz		w6, .Lcbcencloop



	ld1		{v0.16b}, [x5]			/* get iv */

	enc_prepare	w3, x2, x5

	enc_prepare	w3, x2, x6



.Lcbcencloop:

	ld1		{v1.16b}, [x1], #16		/* get next pt block */

	eor		v0.16b, v0.16b, v1.16b		/* ..and xor with iv */

	encrypt_block	v0, w3, x2, x5, w6

	encrypt_block	v0, w3, x2, x6, w7

	st1		{v0.16b}, [x0], #16

	subs		w4, w4, #1

	bne		.Lcbcencloop

	st1		{v0.16b}, [x5]			/* return iv */

	ret

AES_ENDPROC(aes_cbc_encrypt)
@@ -211,7 +212,7 @@ AES_ENTRY(aes_cbc_decrypt) 
	cbz		w6, .LcbcdecloopNx



	ld1		{v7.16b}, [x5]			/* get iv */

	dec_prepare	w3, x2, x5

	dec_prepare	w3, x2, x6



.LcbcdecloopNx:

#if INTERLEAVE >= 2
@@ -248,7 +249,7 @@ AES_ENTRY(aes_cbc_decrypt) 
.Lcbcdecloop:

	ld1		{v1.16b}, [x1], #16		/* get next ct block */

	mov		v0.16b, v1.16b			/* ...and copy to v0 */

	decrypt_block	v0, w3, x2, x5, w6

	decrypt_block	v0, w3, x2, x6, w7

	eor		v0.16b, v0.16b, v7.16b		/* xor with iv => pt */

	mov		v7.16b, v1.16b			/* ct is next iv */

	st1		{v0.16b}, [x0], #16
@@ -256,6 +257,7 @@ AES_ENTRY(aes_cbc_decrypt) 
	bne		.Lcbcdecloop

.Lcbcdecout:

	FRAME_POP

	st1		{v7.16b}, [x5]			/* return iv */

	ret

AES_ENDPROC(aes_cbc_decrypt)
@@ -267,24 +269,15 @@ AES_ENDPROC(aes_cbc_decrypt) 


AES_ENTRY(aes_ctr_encrypt)

	FRAME_PUSH

	cbnz		w6, .Lctrfirst		/* 1st time around? */

	umov		x5, v4.d[1]		/* keep swabbed ctr in reg */

	rev		x5, x5

#if INTERLEAVE >= 2

	cmn		w5, w4			/* 32 bit overflow? */

	bcs		.Lctrinc

	add		x5, x5, #1		/* increment BE ctr */

	b		.LctrincNx

#else

	b		.Lctrinc

#endif

.Lctrfirst:

	cbz		w6, .Lctrnotfirst	/* 1st time around? */

	enc_prepare	w3, x2, x6

	ld1		{v4.16b}, [x5]

	umov		x5, v4.d[1]		/* keep swabbed ctr in reg */

	rev		x5, x5



.Lctrnotfirst:

	umov		x8, v4.d[1]		/* keep swabbed ctr in reg */

	rev		x8, x8

#if INTERLEAVE >= 2

	cmn		w5, w4			/* 32 bit overflow? */

	cmn		w8, w4			/* 32 bit overflow? */

	bcs		.Lctrloop

.LctrloopNx:

	subs		w4, w4, #INTERLEAVE
@@ -292,11 +285,11 @@ AES_ENTRY(aes_ctr_encrypt) 
#if INTERLEAVE == 2

	mov		v0.8b, v4.8b

	mov		v1.8b, v4.8b

	rev		x7, x5

	add		x5, x5, #1

	rev		x7, x8

	add		x8, x8, #1

	ins		v0.d[1], x7

	rev		x7, x5

	add		x5, x5, #1

	rev		x7, x8

	add		x8, x8, #1

	ins		v1.d[1], x7

	ld1		{v2.16b-v3.16b}, [x1], #32	/* get 2 input blocks */

	do_encrypt_block2x
@@ -305,7 +298,7 @@ AES_ENTRY(aes_ctr_encrypt) 
	st1		{v0.16b-v1.16b}, [x0], #32

#else

	ldr		q8, =0x30000000200000001	/* addends 1,2,3[,0] */

	dup		v7.4s, w5

	dup		v7.4s, w8

	mov		v0.16b, v4.16b

	add		v7.4s, v7.4s, v8.4s

	mov		v1.16b, v4.16b
@@ -323,18 +316,12 @@ AES_ENTRY(aes_ctr_encrypt) 
	eor		v2.16b, v7.16b, v2.16b

	eor		v3.16b, v5.16b, v3.16b

	st1		{v0.16b-v3.16b}, [x0], #64

	add		x5, x5, #INTERLEAVE

	add		x8, x8, #INTERLEAVE

#endif

	cbz		w4, .LctroutNx

.LctrincNx:

	rev		x7, x5

	rev		x7, x8

	ins		v4.d[1], x7

	cbz		w4, .Lctrout

	b		.LctrloopNx

.LctroutNx:

	sub		x5, x5, #1

	rev		x7, x5

	ins		v4.d[1], x7

	b		.Lctrout

.Lctr1x:

	adds		w4, w4, #INTERLEAVE

	beq		.Lctrout
@@ -342,30 +329,39 @@ AES_ENTRY(aes_ctr_encrypt) 
.Lctrloop:

	mov		v0.16b, v4.16b

	encrypt_block	v0, w3, x2, x6, w7



	adds		x8, x8, #1		/* increment BE ctr */

	rev		x7, x8

	ins		v4.d[1], x7

	bcs		.Lctrcarry		/* overflow? */



.Lctrcarrydone:

	subs		w4, w4, #1

	bmi		.Lctrhalfblock		/* blocks < 0 means 1/2 block */

	ld1		{v3.16b}, [x1], #16

	eor		v3.16b, v0.16b, v3.16b

	st1		{v3.16b}, [x0], #16

	beq		.Lctrout

.Lctrinc:

	adds		x5, x5, #1		/* increment BE ctr */

	rev		x7, x5

	ins		v4.d[1], x7

	bcc		.Lctrloop		/* no overflow? */

	umov		x7, v4.d[0]		/* load upper word of ctr  */

	rev		x7, x7			/* ... to handle the carry */

	add		x7, x7, #1

	rev		x7, x7

	ins		v4.d[0], x7

	b		.Lctrloop

	bne		.Lctrloop



.Lctrout:

	st1		{v4.16b}, [x5]		/* return next CTR value */

	FRAME_POP

	ret



.Lctrhalfblock:

	ld1		{v3.8b}, [x1]

	eor		v3.8b, v0.8b, v3.8b

	st1		{v3.8b}, [x0]

.Lctrout:

	FRAME_POP

	ret



.Lctrcarry:

	umov		x7, v4.d[0]		/* load upper word of ctr  */

	rev		x7, x7			/* ... to handle the carry */

	add		x7, x7, #1

	rev		x7, x7

	ins		v4.d[0], x7

	b		.Lctrcarrydone

AES_ENDPROC(aes_ctr_encrypt)

	.ltorg

arch/x86/crypto/aesni-intel_glue.c

+6 −5
Original line number Diff line number Diff line
@@ -1024,7 +1024,8 @@ struct { 
	const char *basename;

	struct simd_skcipher_alg *simd;

} aesni_simd_skciphers2[] = {

#if IS_ENABLED(CONFIG_CRYPTO_PCBC)

#if (defined(MODULE) && IS_ENABLED(CONFIG_CRYPTO_PCBC)) || \

    IS_BUILTIN(CONFIG_CRYPTO_PCBC)

	{

		.algname	= "pcbc(aes)",

		.drvname	= "pcbc-aes-aesni",
@@ -1088,8 +1089,8 @@ static void aesni_free_simds(void) 
		    aesni_simd_skciphers[i]; i++)

		simd_skcipher_free(aesni_simd_skciphers[i]);



	for (i = 0; i < ARRAY_SIZE(aesni_simd_skciphers2) &&

		    aesni_simd_skciphers2[i].simd; i++)

	for (i = 0; i < ARRAY_SIZE(aesni_simd_skciphers2); i++)

		if (aesni_simd_skciphers2[i].simd)

			simd_skcipher_free(aesni_simd_skciphers2[i].simd);

}
@@ -1171,7 +1172,7 @@ static int __init aesni_init(void) 
		simd = simd_skcipher_create_compat(algname, drvname, basename);

		err = PTR_ERR(simd);

		if (IS_ERR(simd))

			goto unregister_simds;

			continue;



		aesni_simd_skciphers2[i].simd = simd;

	}

crypto/algapi.c

+1 −0
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ int crypto_register_alg(struct crypto_alg *alg) 
	struct crypto_larval *larval;

	int err;



	alg->cra_flags &= ~CRYPTO_ALG_DEAD;

	err = crypto_check_alg(alg);

	if (err)

		return err;

crypto/algif_aead.c

+1 −1
Original line number Diff line number Diff line
@@ -661,9 +661,9 @@ static int aead_recvmsg_sync(struct socket *sock, struct msghdr *msg, int flags) 
unlock:

	list_for_each_entry_safe(rsgl, tmp, &ctx->list, list) {

		af_alg_free_sg(&rsgl->sgl);

		list_del(&rsgl->list);

		if (rsgl != &ctx->first_rsgl)

			sock_kfree_s(sk, rsgl, sizeof(*rsgl));

		list_del(&rsgl->list);

	}

	INIT_LIST_HEAD(&ctx->list);

	aead_wmem_wakeup(sk);

drivers/crypto/ccp/ccp-dev-v5.c

+1 −1
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ static irqreturn_t ccp5_irq_handler(int irq, void *data) 
static void ccp5_config(struct ccp_device *ccp)

{

	/* Public side */

	iowrite32(0x00001249, ccp->io_regs + CMD5_REQID_CONFIG_OFFSET);

	iowrite32(0x0, ccp->io_regs + CMD5_REQID_CONFIG_OFFSET);

}



static void ccp5other_config(struct ccp_device *ccp)

CRA Git | Maintained and supported by SUSTech CRA and CCSE