diff options
author | Niels Möller <nisse@lysator.liu.se> | 2014-03-15 20:30:46 +0100 |
---|---|---|
committer | Niels Möller <nisse@lysator.liu.se> | 2014-03-15 20:30:46 +0100 |
commit | bcd9029cc5397435c0c8b80450ddc11df9622bc8 (patch) | |
tree | 76175a92ec4025b227b038aa5353d22050ca0632 | |
parent | 853e73af301b1cc77ddb9e75903da8533bf0ffb1 (diff) | |
download | nettle-bcd9029cc5397435c0c8b80450ddc11df9622bc8.tar.gz |
Fixes for the salsa20 iv -> nonce rename.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | salsa20.h | 7 |
2 files changed, 8 insertions, 3 deletions
@@ -1,5 +1,9 @@ 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. @@ -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, |