domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ltq-deu: convert SHA1 after library impl of SHA1 was removed

Browse Source 
The <linux/cryptohash.h> was removed with Linux 5.8, because it only
contained the library implementation of SHA1, which was folded
into <crypto/sha.h>.
So switch this driver away from using <linux/cryptohash.h>.

Signed-off-by: Daniel Kestrel <kestrel1974@t-online.de>
This commit is contained in:
Daniel Kestrel
2021-05-31 14:32:27 +02:00
committed by Hauke Mehrtens
parent 737bd4f296
commit e84c4b54f3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c
View File

@@ -44,8 +44,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/cryptohash.h>
#include <crypto/sha.h> #include <crypto/sha.h>
#include <crypto/hash.h>
#include <crypto/internal/hash.h> #include <crypto/internal/hash.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
@@ -92,13 +92,13 @@ struct sha1_ctx {
extern int disable_deudma; extern int disable_deudma;
/*! \fn static void sha1_transform (u32 *state, const u32 *in) /*! \fn static void sha1_transform1 (u32 *state, const u32 *in)
* \ingroup IFX_SHA1_FUNCTIONS * \ingroup IFX_SHA1_FUNCTIONS
* \brief main interface to sha1 hardware * \brief main interface to sha1 hardware
* \param state current state * \param state current state
* \param in 64-byte block of input * \param in 64-byte block of input
*/ */
static void sha1_transform (struct sha1_ctx *sctx, u32 *state, const u32 *in) static void sha1_transform1 (struct sha1_ctx *sctx, u32 *state, const u32 *in)
{ {
int i = 0; int i = 0;
volatile struct deu_hash_t *hashs = (struct deu_hash_t *) HASH_START; volatile struct deu_hash_t *hashs = (struct deu_hash_t *) HASH_START;
@@ -140,12 +140,12 @@ static void sha1_transform (struct sha1_ctx *sctx, u32 *state, const u32 *in)
CRTCL_SECT_END; CRTCL_SECT_END;
} }
/*! \fn static void sha1_init(struct crypto_tfm *tfm) /*! \fn static void sha1_init1(struct crypto_tfm *tfm)
* \ingroup IFX_SHA1_FUNCTIONS * \ingroup IFX_SHA1_FUNCTIONS
* \brief initialize sha1 hardware * \brief initialize sha1 hardware
* \param tfm linux crypto algo transform * \param tfm linux crypto algo transform
*/ */
static int sha1_init(struct shash_desc *desc) static int sha1_init1(struct shash_desc *desc)
{ {
struct sha1_ctx *sctx = shash_desc_ctx(desc); struct sha1_ctx *sctx = shash_desc_ctx(desc);
@@ -174,9 +174,9 @@ static int sha1_update(struct shash_desc * desc, const u8 *data,
if ((j + len) > 63) { if ((j + len) > 63) {
memcpy (&sctx->buffer[j], data, (i = 64 - j)); memcpy (&sctx->buffer[j], data, (i = 64 - j));
sha1_transform (sctx, sctx->state, (const u32 *)sctx->buffer); sha1_transform1 (sctx, sctx->state, (const u32 *)sctx->buffer);
for (; i + 63 < len; i += 64) { for (; i + 63 < len; i += 64) {
sha1_transform (sctx, sctx->state, (const u32 *)&data[i]); sha1_transform1 (sctx, sctx->state, (const u32 *)&data[i]);
} }
j = 0; j = 0;
@@ -250,7 +250,7 @@ static int sha1_final(struct shash_desc *desc, u8 *out)
*/ */
static struct shash_alg ifxdeu_sha1_alg = { static struct shash_alg ifxdeu_sha1_alg = {
.digestsize = SHA1_DIGEST_SIZE, .digestsize = SHA1_DIGEST_SIZE,
.init = sha1_init, .init = sha1_init1,
.update = sha1_update, .update = sha1_update,
.final = sha1_final, .final = sha1_final,
.descsize = sizeof(struct sha1_ctx), .descsize = sizeof(struct sha1_ctx),

2
package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c
View File

@@ -44,8 +44,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/cryptohash.h>
#include <crypto/internal/hash.h> #include <crypto/internal/hash.h>
#include <crypto/sha.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>