Merge branch 'master' into nist-kat

.github/pull_request_template.md

@@ -2,7 +2,7 @@
 
 <!-- Type some lines about your submission -->
 
-
+<!-- If you are not submitting a new scheme, we suggest removing the following lines -->
 #### Manually checked properties
 <!-- These checkboxes serve for the maintainers of PQClean to verify your submission. Please do not check them yourself. -->
 

CONTRIBUTING.md

@@ -26,9 +26,8 @@ See the section [API](#API) below.
     type: <kem|signature>
     claimed-nist-level: <N>
     length-public-key: <N>          # KEM and signature
-    length-secret-key: <N>          # KEM and signature
     length-ciphertext: <N>          # KEM only
-    length-shared-secret: <N>        # KEM only
+    length-shared-secret: <N>       # KEM only
     length-signature: <N>           # Signature only
     testvectors-sha256: sha256sum of output of testvectors
     principal-submitter: Eve
@@ -38,6 +37,7 @@ See the section [API](#API) below.
       - ...
     implementations:
       - name: clean
+        length-secret-key: <N>       # KEM and signature
         version: <some version indicator>
     ```
 

crypto_sign/sphincs-shake256-128f-simple/clean/wots.c

@@ -68,7 +68,7 @@ static void base_w(unsigned int *output, const size_t out_len,
             bits += 8;
         }
         bits -= SPX_WOTS_LOGW;
-        output[out] = (total >> bits) & (SPX_WOTS_W - 1);
+        output[out] = (unsigned int)((total >> bits) & (SPX_WOTS_W - 1));
         out++;
     }
 }

test/Makefile

@@ -73,3 +73,7 @@ clean:
 	$(RM) $(DEST_DIR)/test_aes
 	$(RM) $(DEST_DIR)/test_fips202
 	$(RM) $(DEST_DIR)/test_sha2
+
+.PHONY: distclean
+distclean:
+	$(RM) -r $(DEST_DIR)

test/test_functest.py

@@ -41,39 +41,44 @@ def check_functest(implementation):
     )
 
 
-@helpers.skip_windows
+@helpers.skip_windows()
 def check_functest_sanitizers(implementation):
     env = None
     if platform.machine() == 'ppc' and os.environ.get('CC', 'gcc') == 'clang':
         raise unittest.SkipTest("Clang does not support ASAN on ppc")
     elif platform.machine() in ['armv7l', 'aarch64']:
         env = {'ASAN_OPTIONS': 'detect_leaks=0'}
+    elif platform.system() == 'Darwin':
+        raise unittest.SkipTest('valgrind is not reliable on OSX')
     else:
         print("Supported platform: {}".format(platform.machine()))
 
-    helpers.ensure_available('valgrind')
     helpers.make('clean-scheme', 'functest',
                  TYPE=implementation.scheme.type,
                  SCHEME=implementation.scheme.name,
                  IMPLEMENTATION=implementation.name,
-                 EXTRAFLAGS='-fsanitize=address,undefined',
+                 EXTRAFLAGS='-g -fsanitize=address,undefined',
                  working_dir=os.path.join('..', 'test'),
                  env=env)
-    helpers.run_subprocess(
-        [os.path.join('..', 'bin', 'functest_{}_{}{}'.format(
-            implementation.scheme.name,
-            implementation.name,
-            '.exe' if os.name == 'nt' else ''
-        ))],
-        os.path.join('..', 'bin'),
-        env=env,
-    )
-    # Remove files with ASAN library compiled in
-    helpers.make('clean-scheme',
-                 TYPE=implementation.scheme.type,
-                 SCHEME=implementation.scheme.name,
-                 IMPLEMENTATION=implementation.name,
-                 working_dir=os.path.join('..', 'test'))
+    try:
+        helpers.run_subprocess(
+            [os.path.join('..', 'bin', 'functest_{}_{}{}'.format(
+                implementation.scheme.name,
+                implementation.name,
+                '.exe' if os.name == 'nt' else ''
+            ))],
+            os.path.join('..', 'bin'),
+            env=env,
+        )
+    except AssertionError as e:
+        raise e
+    finally:
+        # Remove files with ASAN library compiled in
+        helpers.make('clean-scheme',
+                     TYPE=implementation.scheme.type,
+                     SCHEME=implementation.scheme.name,
+                     IMPLEMENTATION=implementation.name,
+                     working_dir=os.path.join('..', 'test'))
 
 
 if __name__ == '__main__':