Fix for CONC-548: Symbol conflict with libsodium

To avoid conflicts (and possible crashes) by duplicate symbols the function crypto_sign was renamed to ma_crypto_sign. Kudos to Peter van Dijk for reporting this issue.
mariadb-corporation · May 3, 2021 · 180c543 · 180c543
1 parent d60bdbe
commit 180c543
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/plugins/auth/ed25519.c b/plugins/auth/ed25519.c
@@ -108,7 +108,7 @@ static int auth_ed25519_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
     return CR_SERVER_HANDSHAKE_ERR;
 
   /* Sign nonce: the crypto_sign function is part of ref10 */
-  crypto_sign(signature, packet, NONCE_BYTES, (unsigned char*)mysql->passwd, strlen(mysql->passwd));
+  ma_crypto_sign(signature, packet, NONCE_BYTES, (unsigned char*)mysql->passwd, strlen(mysql->passwd));
 
   /* send signature to server */
   if (vio->write_packet(vio, signature, CRYPTO_BYTES))

diff --git a/plugins/auth/ref10/crypto_sign.h b/plugins/auth/ref10/crypto_sign.h
@@ -2,7 +2,7 @@ int crypto_sign_keypair(
   unsigned char *pk,
   unsigned char *pw, unsigned long long pwlen
 );
-int crypto_sign(
+int ma_crypto_sign(
   unsigned char *sm,
   const unsigned char *m, unsigned long long mlen,
   const unsigned char *pw, unsigned long long pwlen

diff --git a/plugins/auth/ref10/sign.c b/plugins/auth/ref10/sign.c
@@ -4,7 +4,7 @@
 #include "ge.h"
 #include "sc.h"
 
-int crypto_sign(
+int ma_crypto_sign(
   unsigned char *sm,
   const unsigned char *m,unsigned long long mlen,
   const unsigned char *pw,unsigned long long pwlen