Merge branch 'master' into defined-parameters

The defined-parameters branch should be the new leading branch,
as it supersedes master. This merge is performed using --strategy ours
as there are numerous conflicting changes regarding the different ways
in which SHA3 was added. The master branch is considered to not contain
anything of value that is not contained in the defined-parameters branch.

Prior to merging, the defined-parameters branch was rebased to prevent
the cherry-picked commits from showing up twice.

.kdev4/xmss_ref.kdev4

@@ -1,10 +0,0 @@
-[Buildset]
-BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x10\x00x\x00m\x00s\x00s\x00_\x00r\x00e\x00f)
-
-[Defines And Includes][Compiler]
-Name=GCC
-Path=gcc
-Type=GCC
-
-[Project]
-VersionControlSupport=kdevgit

wots.c

@@ -57,7 +57,7 @@ static void base_w(int *output, const int out_len, const unsigned char *input)
 {
   int in = 0;
   int out = 0;
-  uint32_t total = 0;
+  uint8_t total = 0;
   int bits = 0;
   int consumed = 0;
 
@@ -103,7 +103,7 @@ void wots_sign(unsigned char *sig, const unsigned char *msg, const unsigned char
   unsigned char csum_bytes[len_2_bytes];
   to_byte(csum_bytes, csum, len_2_bytes);
 
-  int csum_basew[len_2_bytes / XMSS_WOTS_LOG_W];
+  int csum_basew[XMSS_WOTS_LEN2];
   base_w(csum_basew, XMSS_WOTS_LEN2, csum_bytes);
 
   for (i = 0; i < XMSS_WOTS_LEN2; i++) {
@@ -137,7 +137,7 @@ void wots_pkFromSig(unsigned char *pk, const unsigned char *sig, const unsigned
   unsigned char csum_bytes[len_2_bytes];
   to_byte(csum_bytes, csum, len_2_bytes);
 
-  int csum_basew[len_2_bytes / XMSS_WOTS_LOG_W];
+  int csum_basew[XMSS_WOTS_LEN2];
   base_w(csum_basew, XMSS_WOTS_LEN2, csum_bytes);
 
   for (i = 0; i < XMSS_WOTS_LEN2; i++) {

xmss_ref.kdev4

@@ -1,4 +0,0 @@
-[Project]
-Name=xmss_ref
-Manager=KDevCustomMakeManager
-VersionControl=kdevgit