Skip to content

Commit 0e9f5c5

Browse files
nielsdosbon
authored and
bon
committed
Fix phpGH-11440: authentication to a sha256_password account fails over SSL
This is similar to bug #78680, but that bug wasn't really fixed in all places. This is the only remaining place. Closes phpGH-11444.
1 parent a59d1c5 commit 0e9f5c5

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

ext/mysqlnd/mysqlnd_auth.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -912,9 +912,12 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self
912912
if (conn->vio->data->ssl) {
913913
DBG_INF("simple clear text under SSL");
914914
/* clear text under SSL */
915-
*auth_data_len = passwd_len;
916-
ret = malloc(passwd_len);
915+
/* NUL termination byte required: https://dev.mysql.com/doc/dev/mysql-server/latest/page_protocol_connection_phase_authentication_methods_clear_text_password.html
916+
* (this is similar to bug #78680, but now as GH-11440) */
917+
*auth_data_len = passwd_len + 1;
918+
ret = malloc(passwd_len + 1);
917919
memcpy(ret, passwd, passwd_len);
920+
ret[passwd_len] = '\0';
918921
} else {
919922
*auth_data_len = 0;
920923
server_public_key = mysqlnd_sha256_get_rsa_key(conn, session_options, pfc_data);

0 commit comments

Comments
 (0)