From a2a2e32c02643a0cec111511220227703fda1cd5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 1 Jul 2024 20:15:00 +0200 Subject: Merging upstream version 1:11.4.2. Signed-off-by: Daniel Baumann --- libmariadb/plugins/auth/ref10/crypto_sign.h | 2 +- libmariadb/plugins/auth/ref10/sign.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'libmariadb/plugins/auth/ref10') diff --git a/libmariadb/plugins/auth/ref10/crypto_sign.h b/libmariadb/plugins/auth/ref10/crypto_sign.h index 5f9b3437..3c676885 100644 --- a/libmariadb/plugins/auth/ref10/crypto_sign.h +++ b/libmariadb/plugins/auth/ref10/crypto_sign.h @@ -3,7 +3,7 @@ int crypto_sign_keypair( unsigned char *pw, unsigned long long pwlen ); int ma_crypto_sign( - unsigned char *sm, + unsigned char *sm, unsigned char *pk, const unsigned char *m, unsigned long long mlen, const unsigned char *pw, unsigned long long pwlen ); diff --git a/libmariadb/plugins/auth/ref10/sign.c b/libmariadb/plugins/auth/ref10/sign.c index b4153201..421a0aed 100644 --- a/libmariadb/plugins/auth/ref10/sign.c +++ b/libmariadb/plugins/auth/ref10/sign.c @@ -5,7 +5,7 @@ #include "sc.h" int ma_crypto_sign( - unsigned char *sm, + unsigned char *sm, unsigned char *pk, const unsigned char *m,unsigned long long mlen, const unsigned char *pw,unsigned long long pwlen ) @@ -26,6 +26,7 @@ int ma_crypto_sign( ge_scalarmult_base(&A,az); ge_p3_tobytes(sm + 32,&A); + memmove(pk, sm + 32, 32); sc_reduce(nonce); ge_scalarmult_base(&R,nonce); -- cgit v1.2.3