diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-20 20:54:24 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-21 20:16:44 +0100 |
| commit | 4f06e67ad2201390ed35a9ea6288a00c0b04782b (patch) | |
| tree | 9b1bec2c7dcf481fda5e5f98060c11718960d7f9 /ext/mysqlnd/mysqlnd_auth.h | |
| parent | 35be0590edfbd996c24ec3cdbad400d3bb91a72c (diff) | |
| download | php-git-4f06e67ad2201390ed35a9ea6288a00c0b04782b.tar.gz | |
Re-commit MySQL 8 cached SHA auth support
With changes to (hopefully) correctly fall back if OpenSSL support
is missing. Furthermore the hard-coded dependency on ext/hash is
no longer an issue, as this extension is required in master.
This reverts commit 63072e9c0ebbb676cd39d0f867d873737c676add, reversing
changes made to 4cbabb6852d2a7d966fb78a53d9d4c1cac18f10b.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.h | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.h b/ext/mysqlnd/mysqlnd_auth.h index 8fc369abca..3ddb5a5f70 100644 --- a/ext/mysqlnd/mysqlnd_auth.h +++ b/ext/mysqlnd/mysqlnd_auth.h @@ -31,26 +31,9 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, 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, - 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, + 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, |