admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: s390/hmac - Use API partial block handling

Browse Source 
Use the Crypto API partial block handling.

Also switch to the generic export format.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu
2025-05-02 17:00:43 +08:00
parent 3bf5337879
commit 08811169ac
1 changed files with 107 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
arch/s390/crypto/hmac_s390.c
View File

@@ -9,10 +9,14 @@
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <asm/cpacf.h>
#include <crypto/sha2.h>
#include <crypto/internal/hash.h>
#include <crypto/hmac.h>
#include <crypto/sha2.h>
#include <linux/cpufeature.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
/*
* KMAC param block layout for sha2 function codes:
@@ -71,7 +75,6 @@ union s390_kmac_gr0 {
struct s390_kmac_sha2_ctx {
u8 param[MAX_DIGEST_SIZE + MAX_IMBL_SIZE + MAX_BLOCK_SIZE];
union s390_kmac_gr0 gr0;
u8 buf[MAX_BLOCK_SIZE];
u64 buflen[2];
};
@@ -95,8 +98,8 @@ static inline void kmac_sha2_set_imbl(u8 *param, u64 buflen_lo,
}
}
static int hash_key(const u8 *in, unsigned int inlen,
u8 *digest, unsigned int digestsize)
static int hash_data(const u8 *in, unsigned int inlen,
u8 *digest, unsigned int digestsize, bool final)
{
unsigned long func;
union {
@@ -123,19 +126,23 @@ static int hash_key(const u8 *in, unsigned int inlen,
switch (digestsize) {
case SHA224_DIGEST_SIZE:
func = CPACF_KLMD_SHA_256;
func = final ? CPACF_KLMD_SHA_256 : CPACF_KIMD_SHA_256;
PARAM_INIT(256, 224, inlen * 8);
if (!final)
digestsize = SHA256_DIGEST_SIZE;
break;
case SHA256_DIGEST_SIZE:
func = CPACF_KLMD_SHA_256;
func = final ? CPACF_KLMD_SHA_256 : CPACF_KIMD_SHA_256;
PARAM_INIT(256, 256, inlen * 8);
break;
case SHA384_DIGEST_SIZE:
func = CPACF_KLMD_SHA_512;
func = final ? CPACF_KLMD_SHA_512 : CPACF_KIMD_SHA_512;
PARAM_INIT(512, 384, inlen * 8);
if (!final)
digestsize = SHA512_DIGEST_SIZE;
break;
case SHA512_DIGEST_SIZE:
func = CPACF_KLMD_SHA_512;
func = final ? CPACF_KLMD_SHA_512 : CPACF_KIMD_SHA_512;
PARAM_INIT(512, 512, inlen * 8);
break;
default:
@@ -151,6 +158,12 @@ static int hash_key(const u8 *in, unsigned int inlen,
return 0;
}
static int hash_key(const u8 *in, unsigned int inlen,
u8 *digest, unsigned int digestsize)
{
return hash_data(in, inlen, digest, digestsize, true);
}
static int s390_hmac_sha2_setkey(struct crypto_shash *tfm,
const u8 *key, unsigned int keylen)
{
@@ -204,50 +217,31 @@ static int s390_hmac_sha2_update(struct shash_desc *desc,
{
struct s390_kmac_sha2_ctx *ctx = shash_desc_ctx(desc);
unsigned int bs = crypto_shash_blocksize(desc->tfm);
unsigned int offset, n;
unsigned int n = round_down(len, bs);
/* check current buffer */
offset = ctx->buflen[0] % bs;
ctx->buflen[0] += len;
if (ctx->buflen[0] < len)
ctx->buflen[0] += n;
if (ctx->buflen[0] < n)
ctx->buflen[1]++;
if (offset + len < bs)
goto store;
/* process one stored block */
if (offset) {
n = bs - offset;
memcpy(ctx->buf + offset, data, n);
ctx->gr0.iimp = 1;
_cpacf_kmac(&ctx->gr0.reg, ctx->param, ctx->buf, bs);
data += n;
len -= n;
offset = 0;
}
/* process as many blocks as possible */
if (len >= bs) {
n = (len / bs) * bs;
ctx->gr0.iimp = 1;
_cpacf_kmac(&ctx->gr0.reg, ctx->param, data, n);
data += n;
len -= n;
}
store:
/* store incomplete block in buffer */
if (len)
memcpy(ctx->buf + offset, data, len);
return 0;
ctx->gr0.iimp = 1;
_cpacf_kmac(&ctx->gr0.reg, ctx->param, data, n);
return len - n;
}
static int s390_hmac_sha2_final(struct shash_desc *desc, u8 *out)
static int s390_hmac_sha2_finup(struct shash_desc *desc, const u8 *src,
unsigned int len, u8 *out)
{
struct s390_kmac_sha2_ctx *ctx = shash_desc_ctx(desc);
unsigned int bs = crypto_shash_blocksize(desc->tfm);
ctx->buflen[0] += len;
if (ctx->buflen[0] < len)
ctx->buflen[1]++;
ctx->gr0.iimp = 0;
kmac_sha2_set_imbl(ctx->param, ctx->buflen[0], ctx->buflen[1], bs);
_cpacf_kmac(&ctx->gr0.reg, ctx->param, ctx->buf, ctx->buflen[0] % bs);
_cpacf_kmac(&ctx->gr0.reg, ctx->param, src, len);
memcpy(out, ctx->param, crypto_shash_digestsize(desc->tfm));
return 0;
@@ -273,22 +267,89 @@ static int s390_hmac_sha2_digest(struct shash_desc *desc,
return 0;
}
#define S390_HMAC_SHA2_ALG(x) { \
static int s390_hmac_export_zero(struct shash_desc *desc, void *out)
{
struct crypto_shash *tfm = desc->tfm;
u8 ipad[SHA512_BLOCK_SIZE];
struct s390_hmac_ctx *ctx;
unsigned int bs;
int err, i;
ctx = crypto_shash_ctx(tfm);
bs = crypto_shash_blocksize(tfm);
for (i = 0; i < bs; i++)
ipad[i] = ctx->key[i] ^ HMAC_IPAD_VALUE;
err = hash_data(ipad, bs, out, crypto_shash_digestsize(tfm), false);
memzero_explicit(ipad, sizeof(ipad));
return err;
}
static int s390_hmac_export(struct shash_desc *desc, void *out)
{
struct s390_kmac_sha2_ctx *ctx = shash_desc_ctx(desc);
unsigned int bs = crypto_shash_blocksize(desc->tfm);
unsigned int ds = bs / 2;
union {
u8 *u8;
u64 *u64;
} p = { .u8 = out };
int err = 0;
if (!ctx->gr0.ikp)
err = s390_hmac_export_zero(desc, out);
else
memcpy(p.u8, ctx->param, ds);
p.u8 += ds;
put_unaligned(ctx->buflen[0], p.u64++);
if (ds == SHA512_DIGEST_SIZE)
put_unaligned(ctx->buflen[1], p.u64);
return err;
}
static int s390_hmac_import(struct shash_desc *desc, const void *in)
{
struct s390_kmac_sha2_ctx *ctx = shash_desc_ctx(desc);
unsigned int bs = crypto_shash_blocksize(desc->tfm);
unsigned int ds = bs / 2;
union {
const u8 *u8;
const u64 *u64;
} p = { .u8 = in };
int err;
err = s390_hmac_sha2_init(desc);
memcpy(ctx->param, p.u8, ds);
p.u8 += ds;
ctx->buflen[0] = get_unaligned(p.u64++);
if (ds == SHA512_DIGEST_SIZE)
ctx->buflen[1] = get_unaligned(p.u64);
if (ctx->buflen[0] | ctx->buflen[1])
ctx->gr0.ikp = 1;
return err;
}
#define S390_HMAC_SHA2_ALG(x, ss) { \
.fc = CPACF_KMAC_HMAC_SHA_##x, \
.alg = { \
.init = s390_hmac_sha2_init, \
.update = s390_hmac_sha2_update, \
.final = s390_hmac_sha2_final, \
.finup = s390_hmac_sha2_finup, \
.digest = s390_hmac_sha2_digest, \
.setkey = s390_hmac_sha2_setkey, \
.export = s390_hmac_export, \
.import = s390_hmac_import, \
.descsize = sizeof(struct s390_kmac_sha2_ctx), \
.halg = { \
.statesize = ss, \
.digestsize = SHA##x##_DIGEST_SIZE, \
.base = { \
.cra_name = "hmac(sha" #x ")", \
.cra_driver_name = "hmac_s390_sha" #x, \
.cra_blocksize = SHA##x##_BLOCK_SIZE, \
.cra_priority = 400, \
.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY | \
CRYPTO_AHASH_ALG_FINUP_MAX, \
.cra_ctxsize = sizeof(struct s390_hmac_ctx), \
.cra_module = THIS_MODULE, \
}, \
@@ -301,10 +362,10 @@ static struct s390_hmac_alg {
unsigned int fc;
struct shash_alg alg;
} s390_hmac_algs[] = {
S390_HMAC_SHA2_ALG(224),
S390_HMAC_SHA2_ALG(256),
S390_HMAC_SHA2_ALG(384),
S390_HMAC_SHA2_ALG(512),
S390_HMAC_SHA2_ALG(224, sizeof(struct crypto_sha256_state)),
S390_HMAC_SHA2_ALG(256, sizeof(struct crypto_sha256_state)),
S390_HMAC_SHA2_ALG(384, SHA512_STATE_SIZE),
S390_HMAC_SHA2_ALG(512, SHA512_STATE_SIZE),
};
static __always_inline void _s390_hmac_algs_unregister(void)