From a5e906a306bbc58b669ee41f2f545038f04ee9fe Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Mon, 15 Apr 2019 16:04:50 +0200 Subject: [PATCH 01/10] Fix sanitizer test --- test/test_functest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_functest.py b/test/test_functest.py index d4517947..0768afdd 100644 --- a/test/test_functest.py +++ b/test/test_functest.py @@ -14,14 +14,14 @@ import helpers def test_functest(): for scheme in pqclean.Scheme.all_schemes(): for implementation in scheme.implementations: - if helpers.permit_test('functest', implementation): + if helpers.permit_test('functest', implementation): yield check_functest, implementation def test_functest_sanitizers(): for scheme in pqclean.Scheme.all_schemes(): for implementation in scheme.implementations: - if helpers.permit_test('functest_sanitizers', implementation): + if helpers.permit_test('functest_sanitizers', implementation): yield check_functest_sanitizers, implementation @@ -41,7 +41,7 @@ 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': From 09a35993da8bf4e825d342936a92b83d104d8bef Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Mon, 15 Apr 2019 16:21:44 +0200 Subject: [PATCH 02/10] Skip Valgrind on OSX --- test/test_functest.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_functest.py b/test/test_functest.py index 0768afdd..f707e491 100644 --- a/test/test_functest.py +++ b/test/test_functest.py @@ -48,6 +48,8 @@ def check_functest_sanitizers(implementation): 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())) From 2a9d793152f2a2c08406932503480f4e1e918fdf Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Tue, 16 Apr 2019 08:02:09 +0200 Subject: [PATCH 03/10] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a9595c44..8bd87d1a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,9 +26,8 @@ See the section [API](#API) below. type: claimed-nist-level: length-public-key: # KEM and signature - length-secret-key: # KEM and signature length-ciphertext: # KEM only - length-shared-secret: # KEM only + length-shared-secret: # KEM only length-signature: # 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: # KEM and signature version: ``` From db7843c5eb5417d7a4488333542941ae52547336 Mon Sep 17 00:00:00 2001 From: Joost Rijneveld Date: Tue, 16 Apr 2019 10:35:08 +0200 Subject: [PATCH 04/10] SPHINCS: make integer promotion explicit --- crypto_sign/sphincs-shake256-128f-simple/clean/wots.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto_sign/sphincs-shake256-128f-simple/clean/wots.c b/crypto_sign/sphincs-shake256-128f-simple/clean/wots.c index 4431986d..ac8b54d1 100644 --- a/crypto_sign/sphincs-shake256-128f-simple/clean/wots.c +++ b/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++; } } From fc7afd8f7670bdc98454c61cc58eedf6edb5bf17 Mon Sep 17 00:00:00 2001 From: Joost Rijneveld Date: Tue, 16 Apr 2019 10:35:48 +0200 Subject: [PATCH 05/10] Add distclean to clean entire ../bin folder --- test/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/Makefile b/test/Makefile index 9fcd68af..ff2a9416 100644 --- a/test/Makefile +++ b/test/Makefile @@ -64,3 +64,7 @@ clean: $(RM) $(DEST_DIR)/test_aes $(RM) $(DEST_DIR)/test_fips202 $(RM) $(DEST_DIR)/test_sha2 + +.PHONY: distclean +distclean: + $(RM) -r $(DEST_DIR) From 9c4aebd8e3e3662e082611ad29928eef31314eec Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Tue, 16 Apr 2019 12:39:14 +0200 Subject: [PATCH 06/10] sanitizers don't need valgrind --- test/test_functest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_functest.py b/test/test_functest.py index f707e491..be45404d 100644 --- a/test/test_functest.py +++ b/test/test_functest.py @@ -53,7 +53,6 @@ def check_functest_sanitizers(implementation): else: print("Supported platform: {}".format(platform.machine())) - helpers.ensure_available('valgrind') helpers.make('clean-scheme', 'functest', TYPE=implementation.scheme.type, SCHEME=implementation.scheme.name, From 327429b62578eebb59b40e6397b7ee5e61ef826c Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Tue, 16 Apr 2019 12:58:43 +0200 Subject: [PATCH 07/10] Make sure -fsanitizer binaries are always cleaned up --- test/test_functest.py | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/test/test_functest.py b/test/test_functest.py index be45404d..4923d74a 100644 --- a/test/test_functest.py +++ b/test/test_functest.py @@ -60,21 +60,25 @@ def check_functest_sanitizers(implementation): EXTRAFLAGS='-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__': From 546d9e41f22b2627654a03856e014801c0e5cb80 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Tue, 16 Apr 2019 13:24:23 +0200 Subject: [PATCH 08/10] Make output of sanitizer nicer --- test/test_functest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_functest.py b/test/test_functest.py index 4923d74a..d7696881 100644 --- a/test/test_functest.py +++ b/test/test_functest.py @@ -57,7 +57,7 @@ def check_functest_sanitizers(implementation): 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) try: From 3431dd2e0a0541b56a4076a124ea294fb4ef1326 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Tue, 16 Apr 2019 12:54:05 +0200 Subject: [PATCH 09/10] No reason for C source files to be executable --- crypto_kem/ntruhps2048509/clean/api.h | 0 crypto_kem/ntruhps2048509/clean/crypto_sort.c | 0 crypto_kem/ntruhps2048509/clean/crypto_sort.h | 0 crypto_kem/ntruhps2048509/clean/kem.c | 0 crypto_kem/ntruhps2048509/clean/owcpa.c | 0 crypto_kem/ntruhps2048509/clean/owcpa.h | 0 crypto_kem/ntruhps2048509/clean/pack3.c | 0 crypto_kem/ntruhps2048509/clean/packq.c | 0 crypto_kem/ntruhps2048509/clean/params.h | 0 crypto_kem/ntruhps2048509/clean/poly.c | 0 crypto_kem/ntruhps2048509/clean/poly.h | 0 crypto_kem/ntruhps2048509/clean/sample.c | 0 crypto_kem/ntruhps2048509/clean/sample.h | 0 crypto_kem/ntruhps2048509/clean/verify.c | 0 crypto_kem/ntruhps2048509/clean/verify.h | 0 15 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/api.h mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/crypto_sort.c mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/crypto_sort.h mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/kem.c mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/owcpa.c mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/owcpa.h mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/pack3.c mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/packq.c mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/params.h mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/poly.c mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/poly.h mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/sample.c mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/sample.h mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/verify.c mode change 100755 => 100644 crypto_kem/ntruhps2048509/clean/verify.h diff --git a/crypto_kem/ntruhps2048509/clean/api.h b/crypto_kem/ntruhps2048509/clean/api.h old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/crypto_sort.c b/crypto_kem/ntruhps2048509/clean/crypto_sort.c old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/crypto_sort.h b/crypto_kem/ntruhps2048509/clean/crypto_sort.h old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/kem.c b/crypto_kem/ntruhps2048509/clean/kem.c old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/owcpa.c b/crypto_kem/ntruhps2048509/clean/owcpa.c old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/owcpa.h b/crypto_kem/ntruhps2048509/clean/owcpa.h old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/pack3.c b/crypto_kem/ntruhps2048509/clean/pack3.c old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/packq.c b/crypto_kem/ntruhps2048509/clean/packq.c old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/params.h b/crypto_kem/ntruhps2048509/clean/params.h old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/poly.c b/crypto_kem/ntruhps2048509/clean/poly.c old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/poly.h b/crypto_kem/ntruhps2048509/clean/poly.h old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/sample.c b/crypto_kem/ntruhps2048509/clean/sample.c old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/sample.h b/crypto_kem/ntruhps2048509/clean/sample.h old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/verify.c b/crypto_kem/ntruhps2048509/clean/verify.c old mode 100755 new mode 100644 diff --git a/crypto_kem/ntruhps2048509/clean/verify.h b/crypto_kem/ntruhps2048509/clean/verify.h old mode 100755 new mode 100644 From 78257d4299c85f5a21f2070063eceaa1bd97e4d9 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Tue, 16 Apr 2019 13:39:26 +0200 Subject: [PATCH 10/10] Add small note to PR template [ci skip] --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index da29dd70..ce2bb1d8 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,7 +2,7 @@ - + #### Manually checked properties