diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-04 05:45:45 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-04 05:47:28 +0200 |
| commit | 03740ef7dffcc80530a89ebde3ccf5464f7f18e6 (patch) | |
| tree | 442543832b4f241a5cea6b6d596cca9a2f79c023 /ext/mysqlnd/mysqlnd_auth.h | |
| parent | f1f39d7ed7fb6f6aaa2edea165aae4bc58a09de7 (diff) | |
| download | php-git-03740ef7dffcc80530a89ebde3ccf5464f7f18e6.tar.gz | |
Revert all MySQL auth related changes
Per bug #76651 these changes do not appear to work correctly in
some cases. As no immediate fix seems to be forthcoming, I'm
reverting these changes.
Revert "Fixed invalid free introduced by d6e81f0bfd0cb90586dd83d4fd47a4302605261a (avoid keeping "invalid" pointer)"
This reverts commit 11507c0e1bfa17a96480f3648397f6975c31551e.
Revert "Fix mysqlnd build without openssl"
This reverts commit 6c9db02ff7812c298d1e7e292ba731d9d3a66790.
Revert "Fix VC compilation as variable size array is not supported"
This reverts commit f96df64cb2219fda42ca875483f874cf3052647c.
Revert "Fix MySQL 8 auth"
This reverts commit d6e81f0bfd0cb90586dd83d4fd47a4302605261a.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.h b/ext/mysqlnd/mysqlnd_auth.h index 3ddb5a5f70..8fc369abca 100644 --- a/ext/mysqlnd/mysqlnd_auth.h +++ b/ext/mysqlnd/mysqlnd_auth.h @@ -31,9 +31,26 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, unsigned int server_charset_no, zend_bool use_full_blown_auth_packet, const char * const auth_protocol, - struct st_mysqlnd_authentication_plugin * auth_plugin, - const zend_uchar * const orig_auth_plugin_data, - const size_t orig_auth_plugin_data_len, + const zend_uchar * const auth_plugin_data, + const size_t auth_plugin_data_len, + char ** switch_to_auth_protocol, + size_t * switch_to_auth_protocol_len, + zend_uchar ** switch_to_auth_protocol_data, + size_t * switch_to_auth_protocol_data_len + ); + +enum_func_status +mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, + const char * const user, + const char * const passwd, + const size_t passwd_len, + const char * const db, + const size_t db_len, + const MYSQLND_SESSION_OPTIONS * const session_options, + zend_ulong mysql_flags, + unsigned int server_charset_no, + zend_bool use_full_blown_auth_packet, + const char * const auth_protocol, const zend_uchar * const auth_plugin_data, const size_t auth_plugin_data_len, char ** switch_to_auth_protocol, |