From 0a020be0d69dd80e383f03983ec82974ac302028 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 13 Aug 2017 16:55:31 +0000
Subject: Convert the sigma and tau initialisers to byte arrays, rather than
 using strings. The original code is perfectly valid C, however it causes some
 compilers to complain since it lacks room for a string NUL terminator and the
 compiler is not smart enough to realise that these are only used as byte
 arrays and never treated as strings.

ok bcook@ beck@ inoguchi@
---
 src/lib/libcrypto/chacha/chacha-merged.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/lib/libcrypto/chacha/chacha-merged.c b/src/lib/libcrypto/chacha/chacha-merged.c
index 557dfd5b56..08511ed273 100644
--- a/src/lib/libcrypto/chacha/chacha-merged.c
+++ b/src/lib/libcrypto/chacha/chacha-merged.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chacha-merged.c,v 1.7 2014/07/11 08:47:47 bcook Exp $ */
+/* $OpenBSD: chacha-merged.c,v 1.8 2017/08/13 16:55:31 jsing Exp $ */
 /*
 chacha-merged.c version 20080118
 D. J. Bernstein
@@ -72,8 +72,17 @@ typedef struct chacha_ctx chacha_ctx;
   a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \
   c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
 
-static const char sigma[16] = "expand 32-byte k";
-static const char tau[16] = "expand 16-byte k";
+/* Initialise with "expand 32-byte k". */
+static const char sigma[16] = {
+	0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x20, 0x33,
+	0x32, 0x2d, 0x62, 0x79, 0x74, 0x65, 0x20, 0x6b,
+};
+
+/* Initialise with "expand 16-byte k". */
+static const char tau[16] = {
+	0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x20, 0x31,
+	0x36, 0x2d, 0x62, 0x79, 0x74, 0x65, 0x20, 0x6b,
+};
 
 static inline void
 chacha_keysetup(chacha_ctx *x, const u8 *k, u32 kbits)
-- 
cgit v1.2.3-55-g6feb