Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Nettle
nettle
Commits
bcd9029c
Commit
bcd9029c
authored
Mar 15, 2014
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for the salsa20 iv -> nonce rename.
parent
853e73af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
ChangeLog
ChangeLog
+4
-0
salsa20.h
salsa20.h
+4
-3
No files found.
ChangeLog
View file @
bcd9029c
2014-03-15 Niels Möller <nisse@lysator.liu.se>
* salsa20.h (SALSA20_NONCE_SIZE): Renamed constant, old name
SALSA20_IV_SIZE kept as an alias.
(salsa20_set_nonce): Update prototype for the 2014-01-20 rename.
* Makefile.in (.asm.s): Add dependencies.
(.s.o, .s.po): Empty any dependency .d file.
...
...
salsa20.h
View file @
bcd9029c
...
...
@@ -50,7 +50,8 @@ extern "C" {
#define SALSA20_128_KEY_SIZE 16
#define SALSA20_256_KEY_SIZE 32
#define SALSA20_BLOCK_SIZE 64
#define SALSA20_IV_SIZE 8
#define SALSA20_NONCE_SIZE 8
#define SALSA20_IV_SIZE SALSA20_NONCE_SIZE
/* Aliases */
#define SALSA20_MIN_KEY_SIZE 16
...
...
@@ -83,8 +84,8 @@ salsa20_set_key(struct salsa20_ctx *ctx,
size_t
length
,
const
uint8_t
*
key
);
void
salsa20_set_
iv
(
struct
salsa20_ctx
*
ctx
,
const
uint8_t
*
iv
);
salsa20_set_
nonce
(
struct
salsa20_ctx
*
ctx
,
const
uint8_t
*
iv
);
void
salsa20_crypt
(
struct
salsa20_ctx
*
ctx
,
size_t
length
,
uint8_t
*
dst
,
...
...
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