From 9904e95bde0f885916b1d1598b5e230ff81bcd8a Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 27 Feb 2017 17:06:14 +0100
Subject: [PATCH] salsa_ref: properly initialize variables when NULL is used as
 constants

---
 src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c b/src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c
index 656593d1..a077d7f4 100644
--- a/src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c
+++ b/src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c
@@ -18,10 +18,10 @@ crypto_core_salsa(unsigned char *out, const unsigned char *in,
         j15;
     int i;
 
-    x0  = 0x61707865;
-    x5  = 0x3320646e;
-    x10 = 0x79622d32;
-    x15 = 0x6b206574;
+    j0  = x0  = 0x61707865;
+    j5  = x5  = 0x3320646e;
+    j10 = x10 = 0x79622d32;
+    j15 = x15 = 0x6b206574;
     if (c != NULL) {
         j0  = x0  = LOAD32_LE(c + 0);
         j5  = x5  = LOAD32_LE(c + 4);