From: tb <tb@openbsd.org>
Date: Sun, 2 Apr 2023 15:36:53 +0000 (+0000)
Subject: Revert r1.9 and reinstate r1.6
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=64ed187ed702bda978ab80ff31d48877eaaf2782;p=openbsd

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.
---

diff --git a/lib/libcrypto/curve25519/curve25519.c b/lib/libcrypto/curve25519/curve25519.c
index cd1b0c58021..4f85a81f47a 100644
--- a/lib/libcrypto/curve25519/curve25519.c
+++ b/lib/libcrypto/curve25519/curve25519.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: curve25519.c,v 1.14 2022/11/17 19:01:59 tb Exp $ */
+/*	$OpenBSD: curve25519.c,v 1.15 2023/04/02 15:36:53 tb Exp $ */
 /*
  * Copyright (c) 2015, Google Inc.
  *
@@ -3495,7 +3495,7 @@ static void table_select(ge_precomp *t, int pos, signed char b) {
  *
  * Preconditions:
  *   a[31] <= 127 */
-void x25519_ge_scalarmult_base(ge_p3 *h, const uint8_t *a) {
+void x25519_ge_scalarmult_base(ge_p3 *h, const uint8_t a[32]) {
   signed char e[64];
   signed char carry;
   ge_p1p1 r;