From bcd9029cc5397435c0c8b80450ddc11df9622bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sat, 15 Mar 2014 20:30:46 +0100
Subject: [PATCH] Fixes for the salsa20 iv -> nonce rename.
---
ChangeLog | 4 ++++
salsa20.h | 7 ++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d7bdbd8f..695a50e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
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,
--
GitLab