archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MNDR:

Browse source 
- rename MYSQLND_NET to MYSQLND_PPEC (protocol packet envelope codec).
  PPEC does only the encoding and decoding to the protocol frame.
This commit is contained in:
Andrey Hristov 2015-11-10 11:02:33 +01:00
parent 80d59a3a36
commit 654d1a7caf
13 changed files with 246 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/mysqlnd/mysqlnd_auth.c
View file

@ -360,7 +360,7 @@ mysqlnd_native_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self
MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd,
const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len,
const MYSQLND_SESSION_OPTIONS * const session_options,
const MYSQLND_NET_OPTIONS * const io_options,
const MYSQLND_PPEC_OPTIONS * const ppec_options,
zend_ulong mysql_flags
)
{
@ -420,7 +420,7 @@ mysqlnd_pam_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self,
MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd,
const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len,
const MYSQLND_SESSION_OPTIONS * const session_options,
const MYSQLND_NET_OPTIONS * const io_options,
const MYSQLND_PPEC_OPTIONS * const ppec_options,
zend_ulong mysql_flags
)
{
@ -481,7 +481,7 @@ mysqlnd_xor_string(char * dst, const size_t dst_len, const char * xor_str, const
static RSA *
mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn,
const MYSQLND_SESSION_OPTIONS * const session_options,
const MYSQLND_NET_OPTIONS * const io_options
const MYSQLND_PPEC_OPTIONS * const io_options
)
{
RSA * ret = NULL;
@ -570,7 +570,7 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self
MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd,
const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len,
const MYSQLND_SESSION_OPTIONS * const session_options,
const MYSQLND_NET_OPTIONS * const io_options,
const MYSQLND_PPEC_OPTIONS * const ppec_options,
zend_ulong mysql_flags
)
{
@ -588,7 +588,7 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self
memcpy(ret, passwd, passwd_len);
} else {
*auth_data_len = 0;
server_public_key = mysqlnd_sha256_get_rsa_key(conn, session_options, io_options);
server_public_key = mysqlnd_sha256_get_rsa_key(conn, session_options, ppec_options);
if (server_public_key) {
int server_public_key_len;