php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Fix GH-11440: authentication to a sha256_password account fails over SSL
This commit is contained in:
Niels Dossche
2023-08-02 20:33:43 +02:00
parent 04df77650d 139a69261f
commit 6fc8ab2eb8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/mysqlnd/mysqlnd_auth.c
View File

@@ -912,9 +912,12 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self
if (conn->vio->data->ssl) {
DBG_INF("simple clear text under SSL");
/* clear text under SSL */
*auth_data_len = passwd_len;
ret = malloc(passwd_len);
/* NUL termination byte required: https://dev.mysql.com/doc/dev/mysql-server/latest/page_protocol_connection_phase_authentication_methods_clear_text_password.html
* (this is similar to bug #78680, but now as GH-11440) */
*auth_data_len = passwd_len + 1;
ret = malloc(passwd_len + 1);
memcpy(ret, passwd, passwd_len);
ret[passwd_len] = '\0';
} else {
*auth_data_len = 0;
server_public_key = mysqlnd_sha256_get_rsa_key(conn, session_options, pfc_data);