diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 11:22:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 11:22:40 +0300 |
| commit | 860e754349646fb8ec8e9231a7fc09a5d4b7c247 (patch) | |
| tree | d66c4b8a3c96e8e0d6e6ad9dfb12cdca750eb754 /plugin | |
| parent | 71e1ddda220c2d452351fc6bf240cb0bad6ccf4a (diff) | |
| parent | 365cd08345ab759308cfcac663a2a5880c0c33cb (diff) | |
| download | mariadb-git-860e754349646fb8ec8e9231a7fc09a5d4b7c247.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_ed25519/server_ed25519.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugin/auth_ed25519/server_ed25519.c b/plugin/auth_ed25519/server_ed25519.c index 6fec98c56fc..b789bd34ca4 100644 --- a/plugin/auth_ed25519/server_ed25519.c +++ b/plugin/auth_ed25519/server_ed25519.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2017, MariaDB + Copyright (c) 2017, 2021, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ static int auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info) /* prepare random nonce */ if (my_random_bytes((unsigned char *)nonce, (int)sizeof(nonce))) - return CR_AUTH_USER_CREDENTIALS; + return CR_ERROR; // eh? OpenSSL error /* send it */ if (vio->write_packet(vio, reply + CRYPTO_BYTES, NONCE_BYTES)) @@ -55,7 +55,7 @@ static int auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info) if (crypto_sign_open(reply, CRYPTO_BYTES + NONCE_BYTES, (unsigned char*)info->auth_string)) - return CR_ERROR; + return CR_AUTH_USER_CREDENTIALS; // wrong password provided by the user return CR_OK; } |