com php-src: Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM): ext/mysqlnd/mysqlnd.c
| From: | Stanislav Malyshev | Date: | Tue, 07 Jul 2015 17:16:54 +0000 |
| Subject: | com php-src: Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM): ext/mysqlnd/mysqlnd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87824@lists.php.net to get a copy of this message | ||
Commit: d8aa5675ad2ead0469c15fad167ecbdd60051716
Author: Stanislav Malyshev <stas@php.net> Sun, 5 Jul 2015 00:00:53 -0700
Parents: 12ff95574bb1303fc03695a1721a8b4529d1ed0a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d8aa5675ad2ead0469c15fad167ecbdd60051716
Log:
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Bugs:
https://bugs.php.net/69669
Changed paths:
M ext/mysqlnd/mysqlnd.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 0a81d0b..7595474 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -487,27 +487,41 @@ mysqlnd_switch_to_ssl_if_needed(
}
#ifdef MYSQLND_SSL_SUPPORTED
- if ((greet_packet->server_capabilities & CLIENT_SSL) && (mysql_flags &
CLIENT_SSL)) {
- zend_bool verify = mysql_flags & CLIENT_SSL_VERIFY_SERVER_CERT? TRUE:FALSE;
- DBG_INF("Switching to SSL");
- if (!PACKET_WRITE(auth_packet, conn)) {
- CONN_SET_STATE(conn, CONN_QUIT_SENT);
- conn->m->send_close(conn);
- SET_CLIENT_ERROR(*conn->error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE,
mysqlnd_server_gone);
- goto end;
- }
+ if (mysql_flags & CLIENT_SSL) {
+ zend_bool server_has_ssl = (greet_packet->server_capabilities & CLIENT_SSL)? TRUE:FALSE;
+ if (server_has_ssl == FALSE) {
+ goto close_conn;
+ } else {
+ zend_bool verify = mysql_flags & CLIENT_SSL_VERIFY_SERVER_CERT? TRUE:FALSE;
+ DBG_INF("Switching to SSL");
+ if (!PACKET_WRITE(auth_packet, conn)) {
+ goto close_conn;
+ }
- conn->net->data->m.set_client_option(conn->net, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
(const char *) &verify);
+ conn->net->data->m.set_client_option(conn->net, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
(const char *) &verify);
- if (FAIL == conn->net->data->m.enable_ssl(conn->net)) {
- goto end;
+ if (FAIL == conn->net->data->m.enable_ssl(conn->net)) {
+ goto end;
+ }
}
}
+#else
+ auth_packet->client_flags &= ~CLIENT_SSL;
+ if (!PACKET_WRITE(auth_packet, conn)) {
+ goto close_conn;
+ }
#endif
ret = PASS;
end:
PACKET_FREE(auth_packet);
DBG_RETURN(ret);
+
+close_conn:
+ CONN_SET_STATE(conn, CONN_QUIT_SENT);
+ conn->m->send_close(conn TSRMLS_CC);
+ SET_CLIENT_ERROR(*conn->error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE,
mysqlnd_server_gone);
+ PACKET_FREE(auth_packet);
+ DBG_RETURN(ret);
}
/* }}} */