superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: lib/sm3 - Remove partial block helpers 

Now that all sm3_base users have been converted to use the API
partial block handling, remove the partial block helpers as well
as the lib/crypto functions.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
pull/1250/head
Herbert Xu 2025-04-18 11:00:57 +08:00
parent 68932c6be3
commit 9939049085
3 changed files with 6 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/crypto/sm3.h
View File

@ -60,7 +60,5 @@ static inline void sm3_init(struct sm3_state *sctx)
}
void sm3_block_generic(struct sm3_state *sctx, u8 const *data, int blocks);
void sm3_update(struct sm3_state *sctx, const u8 *data, unsigned int len);
void sm3_final(struct sm3_state *sctx, u8 *out);
#endif

64
include/crypto/sm3_base.h
View File

@ -11,9 +11,10 @@
#include <crypto/internal/hash.h>
#include <crypto/sm3.h>
#include <linux/crypto.h>
#include <linux/math.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/types.h>
#include <linux/unaligned.h>
typedef void (sm3_block_fn)(struct sm3_state *sst, u8 const *src, int blocks);
@ -24,44 +25,6 @@ static inline int sm3_base_init(struct shash_desc *desc)
return 0;
}
static inline int sm3_base_do_update(struct shash_desc *desc,
const u8 *data,
unsigned int len,
sm3_block_fn *block_fn)
{
struct sm3_state *sctx = shash_desc_ctx(desc);
unsigned int partial = sctx->count % SM3_BLOCK_SIZE;
sctx->count += len;
if (unlikely((partial + len) >= SM3_BLOCK_SIZE)) {
int blocks;
if (partial) {
int p = SM3_BLOCK_SIZE - partial;
memcpy(sctx->buffer + partial, data, p);
data += p;
len -= p;
block_fn(sctx, sctx->buffer, 1);
}
blocks = len / SM3_BLOCK_SIZE;
len %= SM3_BLOCK_SIZE;
if (blocks) {
block_fn(sctx, data, blocks);
data += blocks * SM3_BLOCK_SIZE;
}
partial = 0;
}
if (len)
memcpy(sctx->buffer + partial, data, len);
return 0;
}
static inline int sm3_base_do_update_blocks(struct shash_desc *desc,
const u8 *data, unsigned int len,
sm3_block_fn *block_fn)
@ -105,29 +68,6 @@ static inline int sm3_base_do_finup(struct shash_desc *desc,
return 0;
}
static inline int sm3_base_do_finalize(struct shash_desc *desc,
sm3_block_fn *block_fn)
{
const int bit_offset = SM3_BLOCK_SIZE - sizeof(__be64);
struct sm3_state *sctx = shash_desc_ctx(desc);
__be64 *bits = (__be64 *)(sctx->buffer + bit_offset);
unsigned int partial = sctx->count % SM3_BLOCK_SIZE;
sctx->buffer[partial++] = 0x80;
if (partial > bit_offset) {
memset(sctx->buffer + partial, 0x0, SM3_BLOCK_SIZE - partial);
partial = 0;
block_fn(sctx, sctx->buffer, 1);
}
memset(sctx->buffer + partial, 0x0, bit_offset - partial);
*bits = cpu_to_be64(sctx->count << 3);
block_fn(sctx, sctx->buffer, 1);
return 0;
}
static inline int sm3_base_finish(struct shash_desc *desc, u8 *out)
{
struct sm3_state *sctx = shash_desc_ctx(desc);

68
lib/crypto/sm3.c
View File

@ -8,9 +8,11 @@
* Copyright (C) 2021 Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
*/
#include <linux/module.h>
#include <linux/unaligned.h>
#include <crypto/sm3.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/unaligned.h>
static const u32 ____cacheline_aligned K[64] = {
0x79cc4519, 0xf3988a32, 0xe7311465, 0xce6228cb,
@ -179,67 +181,5 @@ void sm3_block_generic(struct sm3_state *sctx, u8 const *data, int blocks)
}
EXPORT_SYMBOL_GPL(sm3_block_generic);
void sm3_update(struct sm3_state *sctx, const u8 *data, unsigned int len)
{
unsigned int partial = sctx->count % SM3_BLOCK_SIZE;
sctx->count += len;
if ((partial + len) >= SM3_BLOCK_SIZE) {
int blocks;
if (partial) {
int p = SM3_BLOCK_SIZE - partial;
memcpy(sctx->buffer + partial, data, p);
data += p;
len -= p;
sm3_block_generic(sctx, sctx->buffer, 1);
}
blocks = len / SM3_BLOCK_SIZE;
len %= SM3_BLOCK_SIZE;
if (blocks) {
sm3_block_generic(sctx, data, blocks);
data += blocks * SM3_BLOCK_SIZE;
}
partial = 0;
}
if (len)
memcpy(sctx->buffer + partial, data, len);
}
EXPORT_SYMBOL_GPL(sm3_update);
void sm3_final(struct sm3_state *sctx, u8 *out)
{
const int bit_offset = SM3_BLOCK_SIZE - sizeof(u64);
__be64 *bits = (__be64 *)(sctx->buffer + bit_offset);
__be32 *digest = (__be32 *)out;
unsigned int partial = sctx->count % SM3_BLOCK_SIZE;
int i;
sctx->buffer[partial++] = 0x80;
if (partial > bit_offset) {
memset(sctx->buffer + partial, 0, SM3_BLOCK_SIZE - partial);
partial = 0;
sm3_block_generic(sctx, sctx->buffer, 1);
}
memset(sctx->buffer + partial, 0, bit_offset - partial);
*bits = cpu_to_be64(sctx->count << 3);
sm3_block_generic(sctx, sctx->buffer, 1);
for (i = 0; i < 8; i++)
put_unaligned_be32(sctx->state[i], digest++);
/* Zeroize sensitive information. */
memzero_explicit(sctx, sizeof(*sctx));
}
EXPORT_SYMBOL_GPL(sm3_final);
MODULE_DESCRIPTION("Generic SM3 library");
MODULE_LICENSE("GPL v2");