Commit 7916eddc authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: powerpc/poly1305 - Add poly1305_emit_arch wrapper 



Add poly1305_emit_arch with fallback instead of calling assembly
directly.  This is because the state format differs between p10
and that of the generic implementation.

Reported-by: default avatarVenkat Rao Bagalkote <venkat88@linux.ibm.com>
Reported-by: default avatarEric Biggers <ebiggers@google.com>
Fixes: 14d31979 ("crypto: powerpc/poly1305 - Add block-only interface")
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4e0146a9

arch/powerpc/lib/crypto/poly1305-p10-glue.c

+11 −4
Original line number Diff line number Diff line
@@ -14,10 +14,7 @@ 


asmlinkage void poly1305_p10le_4blocks(struct poly1305_block_state *state, const u8 *m, u32 mlen);

asmlinkage void poly1305_64s(struct poly1305_block_state *state, const u8 *m, u32 mlen, int highbit);

asmlinkage void poly1305_emit_arch(const struct poly1305_state *state,

				   u8 digest[POLY1305_DIGEST_SIZE],

				   const u32 nonce[4]);

EXPORT_SYMBOL_GPL(poly1305_emit_arch);

asmlinkage void poly1305_emit_64(const struct poly1305_state *state, const u32 nonce[4], u8 digest[POLY1305_DIGEST_SIZE]);



static __ro_after_init DEFINE_STATIC_KEY_FALSE(have_p10);
@@ -65,6 +62,16 @@ void poly1305_blocks_arch(struct poly1305_block_state *state, const u8 *src, 
}

EXPORT_SYMBOL_GPL(poly1305_blocks_arch);



void poly1305_emit_arch(const struct poly1305_state *state,

			u8 digest[POLY1305_DIGEST_SIZE],

			const u32 nonce[4])

{

	if (!static_key_enabled(&have_p10))

		return poly1305_emit_generic(state, digest, nonce);

	poly1305_emit_64(state, nonce, digest);

}

EXPORT_SYMBOL_GPL(poly1305_emit_arch);



bool poly1305_is_arch_optimized(void)

{

	return static_key_enabled(&have_p10);

arch/powerpc/lib/crypto/poly1305-p10le_64.S

+2 −2
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ SYM_FUNC_END(poly1305_64s) 
# Input: r3 = h, r4 = s, r5 = mac

# mac = h + s

#

SYM_FUNC_START(poly1305_emit_arch)

SYM_FUNC_START(poly1305_emit_64)

	ld	10, 0(3)

	ld	11, 8(3)

	ld	12, 16(3)
@@ -1060,7 +1060,7 @@ Skip_h64: 
	std	10, 0(5)

	std	11, 8(5)

	blr

SYM_FUNC_END(poly1305_emit_arch)

SYM_FUNC_END(poly1305_emit_64)



SYM_DATA_START_LOCAL(RMASK)

.align 5