From: Mark Andrews <marka@isc.org>
Date: Tue, 10 Jun 2014 02:38:32 +0000 (+1000)
Subject: silence compiler warnings
X-Git-Tag: v9.11.0a1~1561
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=5331f97edc125f66ac6d0060b3d016309169f411;p=thirdparty%2Fbind9.git

silence compiler warnings
---

diff --git a/lib/isc/chacha_private.h b/lib/isc/chacha_private.h
index d79329dbbcb..a6653c6a42e 100644
--- a/lib/isc/chacha_private.h
+++ b/lib/isc/chacha_private.h
@@ -51,8 +51,10 @@ typedef struct
   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";
+static const char sigma[16] = { 'e', 'x', 'p', 'a', 'n', 'd', ' ', '3',
+				'2', '-', 'b', 'y', 't', 'e', ' ', 'k' };
+static const char tau[16] = { 'e', 'x', 'p', 'a', 'n', 'd', ' ', '1',
+			      '6', '-', 'b', 'y', 't', 'e', ' ', 'k' };
 
 static void
 chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits,u32 ivbits)
diff --git a/lib/isc/random.c b/lib/isc/random.c
index dc9893fff79..06640eec7ee 100644
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -64,8 +64,8 @@
 #define KEYSTREAM_ONLY
 #include "chacha_private.h"
 
-#define CHACHA_KEYSIZE 32
-#define CHACHA_IVSIZE 8
+#define CHACHA_KEYSIZE 32U
+#define CHACHA_IVSIZE 8U
 #define CHACHA_BLOCKSIZE 64
 #define CHACHA_BUFFERSIZE (16 * CHACHA_BLOCKSIZE)