diff options
author | tb <> | 2023-04-02 15:36:53 +0000 |
---|---|---|
committer | tb <> | 2023-04-02 15:36:53 +0000 |
commit | 70ae67c5ecde42ae5ec64f3f4507f658275a3351 (patch) | |
tree | cbb87fcdacac1a7f3e8cbe652089b158fa838572 | |
parent | cf724aab877ffcaa29549a1e190b9568d842d1ba (diff) | |
download | openbsd-70ae67c5ecde42ae5ec64f3f4507f658275a3351.tar.gz openbsd-70ae67c5ecde42ae5ec64f3f4507f658275a3351.tar.bz2 openbsd-70ae67c5ecde42ae5ec64f3f4507f658275a3351.zip |
Revert r1.9 and reinstate r1.6
The argument change to x5519_ge_scalarmult_base() was made to match the
prototype in the header. More recent compilers warn about such ptr vs
array mismatches.
-rw-r--r-- | src/lib/libcrypto/curve25519/curve25519.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/curve25519/curve25519.c b/src/lib/libcrypto/curve25519/curve25519.c index cd1b0c5802..4f85a81f47 100644 --- a/src/lib/libcrypto/curve25519/curve25519.c +++ b/src/lib/libcrypto/curve25519/curve25519.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: curve25519.c,v 1.14 2022/11/17 19:01:59 tb Exp $ */ | 1 | /* $OpenBSD: curve25519.c,v 1.15 2023/04/02 15:36:53 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2015, Google Inc. | 3 | * Copyright (c) 2015, Google Inc. |
4 | * | 4 | * |
@@ -3495,7 +3495,7 @@ static void table_select(ge_precomp *t, int pos, signed char b) { | |||
3495 | * | 3495 | * |
3496 | * Preconditions: | 3496 | * Preconditions: |
3497 | * a[31] <= 127 */ | 3497 | * a[31] <= 127 */ |
3498 | void x25519_ge_scalarmult_base(ge_p3 *h, const uint8_t *a) { | 3498 | void x25519_ge_scalarmult_base(ge_p3 *h, const uint8_t a[32]) { |
3499 | signed char e[64]; | 3499 | signed char e[64]; |
3500 | signed char carry; | 3500 | signed char carry; |
3501 | ge_p1p1 r; | 3501 | ge_p1p1 r; |