diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2020-01-26 16:42:57 +0100 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2020-01-26 16:42:57 +0100 |
| commit | ce4e9458e0ac91c2bb49281a8446c09dd6e3ca24 (patch) | |
| tree | de03b8fe63819566cba282e466e76880341bd888 | |
| parent | 12199f55eb93e8970b783ba1eb073ac370775ab7 (diff) | |
| parent | 33d047b2fdf56207fa26a41c531eb7b3192ced53 (diff) | |
| download | nettle-ce4e9458e0ac91c2bb49281a8446c09dd6e3ca24.tar.gz | |
Merge commit '33d047b2fdf56207fa26a41c531eb7b3192ced53' into ecc-gost
For gitlab CI fix.
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | examples/hogweed-benchmark.c | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85acdf14..663f98f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,7 @@ build/x86-64: make check -j4 tags: - shared + - linux except: - tags build/mini-gmp: @@ -28,6 +29,7 @@ build/mini-gmp: make check -j4 tags: - shared + - linux except: - tags build/c89: @@ -38,6 +40,7 @@ build/c89: make check -j4 tags: - shared + - linux except: - tags build/ndebug: @@ -48,6 +51,7 @@ build/ndebug: make check -j4 tags: - shared + - linux except: - tags build/ubsan: @@ -58,6 +62,7 @@ build/ubsan: --disable-documentation && make -j4 && make check -j4 tags: - shared + - linux except: - tags build/asan: @@ -68,6 +73,7 @@ build/asan: make -j4 && make check -j4 tags: - shared + - linux except: - tags build/static-analyzers: @@ -78,6 +84,7 @@ build/static-analyzers: - scan-build --status-bugs -o scan-build-lib make -j$(nproc) tags: - shared + - linux except: - tags artifacts: @@ -97,6 +104,7 @@ build/gnutls: make -j $(nproc) check tags: - shared + - linux except: - tags artifacts: @@ -122,6 +130,7 @@ Debian.cross.x86: make check -j4 tags: - shared + - linux except: - tags .Debian.cross.template: &Debian_cross_template @@ -143,6 +152,7 @@ Debian.cross.x86: - make -j$(nproc) check tags: - shared + - linux except: - tags Debian.cross.arm-linux-gnueabihf: @@ -1,3 +1,8 @@ +2020-01-25 Niels Möller <nisse@lysator.liu.se> + + * examples/hogweed-benchmark.c (bench_curve_init): Pass correct + sizes to knuth_lfib_random. Patch contributed by Dmitry Baryshkov. + 2020-01-15 Niels Möller <nisse@lysator.liu.se> * Makefile.in: Replace suffix rules by pattern rules. Move .asm diff --git a/examples/hogweed-benchmark.c b/examples/hogweed-benchmark.c index bceed77e..3d008021 100644 --- a/examples/hogweed-benchmark.c +++ b/examples/hogweed-benchmark.c @@ -873,12 +873,12 @@ bench_curve_init (unsigned size) case 255: ctx->mul = curve25519_mul; ctx->mul_g = curve25519_mul_g; - knuth_lfib_random (&lfib, sizeof(CURVE25519_SIZE), ctx->s); + knuth_lfib_random (&lfib, CURVE25519_SIZE, ctx->s); break; case 448: ctx->mul = curve448_mul; ctx->mul_g = curve448_mul_g; - knuth_lfib_random (&lfib, sizeof(CURVE448_SIZE), ctx->s); + knuth_lfib_random (&lfib, CURVE448_SIZE, ctx->s); break; default: abort (); |