summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/sha/sha3.c6
-rw-r--r--src/lib/libcrypto/sha/sha3_internal.h10
2 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/libcrypto/sha/sha3.c b/src/lib/libcrypto/sha/sha3.c
index a3ef95f815..acb7de7d9d 100644
--- a/src/lib/libcrypto/sha/sha3.c
+++ b/src/lib/libcrypto/sha/sha3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha3.c,v 1.6 2023/04/15 18:19:06 jsing Exp $ */ 1/* $OpenBSD: sha3.c,v 1.7 2023/04/15 18:29:26 jsing Exp $ */
2/* 2/*
3 * The MIT License (MIT) 3 * The MIT License (MIT)
4 * 4 *
@@ -25,6 +25,10 @@
25 25
26#include "sha3_internal.h" 26#include "sha3_internal.h"
27 27
28#define KECCAKF_ROUNDS 24
29
30#define ROTL64(x, y) (((x) << (y)) | ((x) >> (64 - (y))))
31
28static const uint64_t sha3_keccakf_rndc[24] = { 32static const uint64_t sha3_keccakf_rndc[24] = {
29 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 33 0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
30 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, 34 0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
diff --git a/src/lib/libcrypto/sha/sha3_internal.h b/src/lib/libcrypto/sha/sha3_internal.h
index 1ed4b02f7c..20144effd1 100644
--- a/src/lib/libcrypto/sha/sha3_internal.h
+++ b/src/lib/libcrypto/sha/sha3_internal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha3_internal.h,v 1.5 2023/04/15 18:22:53 jsing Exp $ */ 1/* $OpenBSD: sha3_internal.h,v 1.6 2023/04/15 18:29:26 jsing Exp $ */
2/* 2/*
3 * The MIT License (MIT) 3 * The MIT License (MIT)
4 * 4 *
@@ -29,14 +29,6 @@
29#ifndef HEADER_SHA3_INTERNAL_H 29#ifndef HEADER_SHA3_INTERNAL_H
30#define HEADER_SHA3_INTERNAL_H 30#define HEADER_SHA3_INTERNAL_H
31 31
32#ifndef KECCAKF_ROUNDS
33#define KECCAKF_ROUNDS 24
34#endif
35
36#ifndef ROTL64
37#define ROTL64(x, y) (((x) << (y)) | ((x) >> (64 - (y))))
38#endif
39
40typedef struct { 32typedef struct {
41 union { 33 union {
42 uint8_t b[200]; /* State as 8 bit bytes. */ 34 uint8_t b[200]; /* State as 8 bit bytes. */