Skip to content

Commit

Permalink
Remove unused Edon-R variants
Browse files Browse the repository at this point in the history
This commit removes the edonr_byteorder.h file and all unused
variants of Edon-R.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tino Reichardt <milky-zfs@mcmilk.de>
Closes openzfs#13618
  • Loading branch information
mcmilk authored and lundman committed Mar 17, 2023
1 parent 2fd11bf commit e048490
Show file tree
Hide file tree
Showing 5 changed files with 194 additions and 935 deletions.
39 changes: 10 additions & 29 deletions include/sys/edonr.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/*
* IDI,NTNU
*
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
Expand All @@ -19,15 +17,13 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
*
* Copyright (C) 2009, 2010, Jorn Amundsen <jorn.amundsen@ntnu.no>
*
* Tweaked Edon-R implementation for SUPERCOP, based on NIST API.
*
* $Id: edonr.h 517 2013-02-17 20:34:39Z joern $
*/

/*
* Portions copyright (c) 2013, Saso Kiselkov, All rights reserved
* Based on Edon-R implementation for SUPERCOP, based on NIST API.
* Copyright (c) 2009, 2010 Jørn Amundsen <jorn.amundsen@ntnu.no>
* Copyright (c) 2013 Saso Kiselkov, All rights reserved
* Copyright (c) 2022 Tino Reichardt <milky-zfs@mcmilk.de>
*/

#ifndef _SYS_EDONR_H_
Expand All @@ -40,8 +36,8 @@ extern "C" {
#ifdef _KERNEL
#include <sys/types.h>
#else
#include <stdint.h> /* uint32_t... */
#include <stdlib.h> /* size_t ... */
#include <stdint.h>
#include <stdlib.h>
#endif

/*
Expand All @@ -52,44 +48,29 @@ extern "C" {
*/

/* Specific algorithm definitions */
#define EdonR224_DIGEST_SIZE 28
#define EdonR224_BLOCK_SIZE 64
#define EdonR256_DIGEST_SIZE 32
#define EdonR256_BLOCK_SIZE 64
#define EdonR384_DIGEST_SIZE 48
#define EdonR384_BLOCK_SIZE 128
#define EdonR512_DIGEST_SIZE 64
#define EdonR512_BLOCK_SIZE 128

#define EdonR256_BLOCK_BITSIZE 512
#define EdonR512_BLOCK_BITSIZE 1024

typedef struct {
uint32_t DoublePipe[16];
uint8_t LastPart[EdonR256_BLOCK_SIZE * 2];
} EdonRData256;
typedef struct {
uint64_t DoublePipe[16];
uint8_t LastPart[EdonR512_BLOCK_SIZE * 2];
} EdonRData512;

typedef struct {
size_t hashbitlen;

/* + algorithm specific parameters */
int unprocessed_bits;
uint64_t bits_processed;
int unprocessed_bits;
union {
EdonRData256 p256[1];
EdonRData512 p512[1];
} pipe[1];
} EdonRState;

void EdonRInit(EdonRState *state, size_t hashbitlen);
void EdonRInit(EdonRState *state);
void EdonRUpdate(EdonRState *state, const uint8_t *data, size_t databitlen);
void EdonRFinal(EdonRState *state, uint8_t *hashval);
void EdonRHash(size_t hashbitlen, const uint8_t *data, size_t databitlen,
uint8_t *hashval);
void EdonRHash(const uint8_t *data, size_t databitlen, uint8_t *hashval);

#ifdef __cplusplus
}
Expand Down
Loading

0 comments on commit e048490

Please sign in to comment.