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

crypto: mips/poly1305 - Add block-only interface 



Add block-only interface.

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

arch/mips/lib/crypto/poly1305-glue.c

+20 −9
Original line number Diff line number Diff line
@@ -5,23 +5,33 @@ 
 * Copyright (C) 2019 Linaro Ltd. <ard.biesheuvel@linaro.org>

 */



#include <crypto/poly1305.h>

#include <crypto/internal/poly1305.h>

#include <linux/cpufeature.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/string.h>

#include <linux/unaligned.h>



asmlinkage void poly1305_init_mips(void *state, const u8 *key);

asmlinkage void poly1305_blocks_mips(void *state, const u8 *src, u32 len, u32 hibit);

asmlinkage void poly1305_emit_mips(void *state, u8 *digest, const u32 *nonce);

asmlinkage void poly1305_block_init_arch(

	struct poly1305_block_state *state,

	const u8 raw_key[POLY1305_BLOCK_SIZE]);

EXPORT_SYMBOL_GPL(poly1305_block_init_arch);

asmlinkage void poly1305_blocks_arch(struct poly1305_block_state *state,

				     const u8 *src, u32 len, u32 hibit);

EXPORT_SYMBOL_GPL(poly1305_blocks_arch);

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);



void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 key[POLY1305_KEY_SIZE])

{

	poly1305_init_mips(&dctx->h, key);

	dctx->s[0] = get_unaligned_le32(key + 16);

	dctx->s[1] = get_unaligned_le32(key + 20);

	dctx->s[2] = get_unaligned_le32(key + 24);

	dctx->s[3] = get_unaligned_le32(key + 28);

	dctx->buflen = 0;

	poly1305_block_init_arch(&dctx->state, key);

}

EXPORT_SYMBOL(poly1305_init_arch);
@@ -37,7 +47,7 @@ void poly1305_update_arch(struct poly1305_desc_ctx *dctx, const u8 *src, 
		dctx->buflen += bytes;



		if (dctx->buflen == POLY1305_BLOCK_SIZE) {

			poly1305_blocks_mips(&dctx->h, dctx->buf,

			poly1305_blocks_arch(&dctx->state, dctx->buf,

					     POLY1305_BLOCK_SIZE, 1);

			dctx->buflen = 0;

		}
@@ -46,7 +56,7 @@ void poly1305_update_arch(struct poly1305_desc_ctx *dctx, const u8 *src, 
	if (likely(nbytes >= POLY1305_BLOCK_SIZE)) {

		unsigned int len = round_down(nbytes, POLY1305_BLOCK_SIZE);



		poly1305_blocks_mips(&dctx->h, src, len, 1);

		poly1305_blocks_arch(&dctx->state, src, len, 1);

		src += len;

		nbytes %= POLY1305_BLOCK_SIZE;

	}
@@ -64,10 +74,11 @@ void poly1305_final_arch(struct poly1305_desc_ctx *dctx, u8 *dst) 
		dctx->buf[dctx->buflen++] = 1;

		memset(dctx->buf + dctx->buflen, 0,

		       POLY1305_BLOCK_SIZE - dctx->buflen);

		poly1305_blocks_mips(&dctx->h, dctx->buf, POLY1305_BLOCK_SIZE, 0);

		poly1305_blocks_arch(&dctx->state, dctx->buf,

				     POLY1305_BLOCK_SIZE, 0);

	}



	poly1305_emit_mips(&dctx->h, dst, dctx->s);

	poly1305_emit_arch(&dctx->h, dst, dctx->s);

	*dctx = (struct poly1305_desc_ctx){};

}

EXPORT_SYMBOL(poly1305_final_arch);

arch/mips/lib/crypto/poly1305-mips.pl

+6 −6
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@ $code.=<<___; 
#endif



#ifdef	__KERNEL__

# define poly1305_init   poly1305_init_mips

# define poly1305_blocks poly1305_blocks_mips

# define poly1305_emit   poly1305_emit_mips

# define poly1305_init   poly1305_block_init_arch

# define poly1305_blocks poly1305_blocks_arch

# define poly1305_emit   poly1305_emit_arch

#endif



#if defined(__MIPSEB__) && !defined(MIPSEB)
@@ -565,9 +565,9 @@ $code.=<<___; 
#endif



#ifdef	__KERNEL__

# define poly1305_init   poly1305_init_mips

# define poly1305_blocks poly1305_blocks_mips

# define poly1305_emit   poly1305_emit_mips

# define poly1305_init   poly1305_block_init_arch

# define poly1305_blocks poly1305_blocks_arch

# define poly1305_emit   poly1305_emit_arch

#endif



#if defined(__MIPSEB__) && !defined(MIPSEB)