Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nettle
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
5
Merge Requests
5
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Nettle
nettle
Commits
f77bd0a3
Commit
f77bd0a3
authored
Dec 25, 2019
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Generalize _sha3_pad to take magic value as argument.
parent
d4c3e2ee
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
7 deletions
+14
-7
sha3-224.c
sha3-224.c
+1
-1
sha3-256.c
sha3-256.c
+1
-1
sha3-384.c
sha3-384.c
+1
-1
sha3-512.c
sha3-512.c
+1
-1
sha3-internal.h
sha3-internal.h
+8
-1
sha3.c
sha3.c
+2
-2
No files found.
sha3-224.c
View file @
f77bd0a3
...
...
@@ -63,7 +63,7 @@ sha3_224_digest(struct sha3_224_ctx *ctx,
size_t
length
,
uint8_t
*
digest
)
{
_sha3_pad
(
&
ctx
->
state
,
SHA3_224_BLOCK_SIZE
,
ctx
->
block
,
ctx
->
index
);
_sha3_pad
_hash
(
&
ctx
->
state
,
SHA3_224_BLOCK_SIZE
,
ctx
->
block
,
ctx
->
index
);
_nettle_write_le64
(
length
,
digest
,
ctx
->
state
.
a
);
sha3_224_init
(
ctx
);
}
sha3-256.c
View file @
f77bd0a3
...
...
@@ -63,7 +63,7 @@ sha3_256_digest(struct sha3_256_ctx *ctx,
size_t
length
,
uint8_t
*
digest
)
{
_sha3_pad
(
&
ctx
->
state
,
SHA3_256_BLOCK_SIZE
,
ctx
->
block
,
ctx
->
index
);
_sha3_pad
_hash
(
&
ctx
->
state
,
SHA3_256_BLOCK_SIZE
,
ctx
->
block
,
ctx
->
index
);
_nettle_write_le64
(
length
,
digest
,
ctx
->
state
.
a
);
sha3_256_init
(
ctx
);
}
sha3-384.c
View file @
f77bd0a3
...
...
@@ -63,7 +63,7 @@ sha3_384_digest(struct sha3_384_ctx *ctx,
size_t
length
,
uint8_t
*
digest
)
{
_sha3_pad
(
&
ctx
->
state
,
SHA3_384_BLOCK_SIZE
,
ctx
->
block
,
ctx
->
index
);
_sha3_pad
_hash
(
&
ctx
->
state
,
SHA3_384_BLOCK_SIZE
,
ctx
->
block
,
ctx
->
index
);
_nettle_write_le64
(
length
,
digest
,
ctx
->
state
.
a
);
sha3_384_init
(
ctx
);
}
sha3-512.c
View file @
f77bd0a3
...
...
@@ -63,7 +63,7 @@ sha3_512_digest(struct sha3_512_ctx *ctx,
size_t
length
,
uint8_t
*
digest
)
{
_sha3_pad
(
&
ctx
->
state
,
SHA3_512_BLOCK_SIZE
,
ctx
->
block
,
ctx
->
index
);
_sha3_pad
_hash
(
&
ctx
->
state
,
SHA3_512_BLOCK_SIZE
,
ctx
->
block
,
ctx
->
index
);
_nettle_write_le64
(
length
,
digest
,
ctx
->
state
.
a
);
sha3_512_init
(
ctx
);
}
sha3-internal.h
View file @
f77bd0a3
...
...
@@ -39,14 +39,21 @@
#define _sha3_update _nettle_sha3_update
#define _sha3_pad _nettle_sha3_pad
#define SHA3_HASH_MAGIC 6
unsigned
_sha3_update
(
struct
sha3_state
*
state
,
unsigned
block_size
,
uint8_t
*
block
,
unsigned
pos
,
size_t
length
,
const
uint8_t
*
data
);
void
_sha3_pad
(
struct
sha3_state
*
state
,
unsigned
block_size
,
uint8_t
*
block
,
unsigned
pos
);
unsigned
block_size
,
uint8_t
*
block
,
unsigned
pos
,
uint8_t
magic
);
#define _sha3_pad_hash(state, block_size, block, pos) \
_sha3_pad (state, block_size, block, pos, SHA3_HASH_MAGIC)
#endif
sha3.c
View file @
f77bd0a3
...
...
@@ -92,10 +92,10 @@ _sha3_update (struct sha3_state *state,
void
_sha3_pad
(
struct
sha3_state
*
state
,
unsigned
block_size
,
uint8_t
*
block
,
unsigned
pos
)
unsigned
block_size
,
uint8_t
*
block
,
unsigned
pos
,
uint8_t
magic
)
{
assert
(
pos
<
block_size
);
block
[
pos
++
]
=
6
;
block
[
pos
++
]
=
magic
;
memset
(
block
+
pos
,
0
,
block_size
-
pos
);
block
[
block_size
-
1
]
|=
0x80
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment