summaryrefslogtreecommitdiff
path: root/salsa20.h
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2014-03-15 20:30:46 +0100
committerNiels Möller <nisse@lysator.liu.se>2014-03-15 20:30:46 +0100
commitbcd9029cc5397435c0c8b80450ddc11df9622bc8 (patch)
tree76175a92ec4025b227b038aa5353d22050ca0632 /salsa20.h
parent853e73af301b1cc77ddb9e75903da8533bf0ffb1 (diff)
downloadnettle-bcd9029cc5397435c0c8b80450ddc11df9622bc8.tar.gz
Fixes for the salsa20 iv -> nonce rename.
Diffstat (limited to 'salsa20.h')
-rw-r--r--salsa20.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/salsa20.h b/salsa20.h
index 444b5b43..35399741 100644
--- a/salsa20.h
+++ b/salsa20.h
@@ -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,