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_wireprotocol.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_wireprotocol.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index 6e531b0e54..7dfb256eec 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -281,6 +281,16 @@ typedef struct st_mysqlnd_packet_sha256_pk_request_response { size_t public_key_len; } MYSQLND_PACKET_SHA256_PK_REQUEST_RESPONSE; +typedef struct st_mysqlnd_packet_cached_sha2_result { + MYSQLND_PACKET_HEADER header; + uint8_t response_code; + uint8_t result; + uint8_t request; + zend_uchar * password; + size_t password_len; +} MYSQLND_PACKET_CACHED_SHA2_RESULT; + + zend_ulong php_mysqlnd_net_field_length(const zend_uchar **packet); zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, const uint64_t length); |