Commit Graph

1552 Commits

Author SHA1 Message Date
de2910f75b Fixed SSL_accept failing if the GWBUF with the initial MySQL auth packet contains some of the SSL authentication data. 2015-06-09 22:27:15 +03:00
196d41cb88 More debug output. 2015-06-09 20:02:45 +03:00
1275a594ac Added missing utils library link from testmodutils. 2015-06-09 18:44:19 +03:00
e9f9e0abe5 Change DCB* to DCB * 2015-06-09 15:39:57 +01:00
1ad1a31ed7 Fixed the OpenSSL error stack being printed wrong. 2015-06-09 17:18:25 +03:00
ab120cb1de Added Diffie-Hellman key exchange for MaxScale. 2015-06-09 17:04:51 +03:00
152f9bbc4a Merge remote-tracking branch 'origin/develop' into MXS-122 2015-06-09 13:51:55 +01:00
393e25e953 Fix bug in dcb; rearrange mysql_backend gw_backend_close to cope with receiving DCB that is no longer linked to a session. 2015-06-09 12:03:58 +01:00
d0e92a15f8 Move decrement of server connections into zombie processing; introduce dcb_close_finish to be called either in dcb_close or when persistent dcb is discarded. 2015-06-09 11:41:43 +01:00
99e9987f9b Clear persistent pool DCBs when server freed. 2015-06-09 08:26:14 +01:00
06c5da7b17 Minor fix to SSL authentication. 2015-06-09 02:56:55 +03:00
1c36cfb285 Added more debug output. 2015-06-08 18:04:43 +03:00
b8e55fe28d Fixed SSL_accept failing when more data was in the socket buffer than was used. 2015-06-07 12:45:08 +03:00
d19ccc6f84 Fixed SSL_ERROR_WANT_READ, SSL_ERROR_WANT_WRITE and SSL_ERROR_NONE causing a debug assert. 2015-06-05 20:36:04 +03:00
1989a1482c Fixed empty reads causing a debug assert with large packets. 2015-06-05 19:40:09 +03:00
61b1f34671 Added more descriptive debug output. 2015-06-05 18:52:44 +03:00
518ef5050e Fixed debug asserts. 2015-06-05 12:15:19 +03:00
e83799648a Fixed queries getting stuck when the SSL records were of the maximum allowed size. 2015-06-05 11:00:51 +03:00
cc1f720ea3 Removed log flushing on every dcb_read_SSL if debug log is enabled. 2015-06-04 21:12:16 +03:00
ce570685cd Moved assertions around. 2015-06-04 19:31:58 +03:00
dceccce2ef Changed gwbuf_length function to GWBUF_LENGTH macro in dcb_read_SSL. 2015-06-04 16:52:43 +03:00
e395ab1442 Provide explicit time checking for age of persistent DCBs. 2015-06-03 16:47:02 +01:00
fe2f8e70d1 Add CHK_SERVER capability and test in dcb_persistent_clean_count 2015-06-03 15:39:06 +01:00
ef6b6566e6 Fixes? 2015-06-03 15:08:08 +01:00
fe5e40e397 Added missing initialization of user and password variables in monitor_alloc. 2015-06-03 16:08:11 +03:00
a033cbf200 Added more informative error messages when SSL handshake fails. 2015-06-03 14:14:05 +03:00
cb7eb5848b Fixes, tidying up, etc. 2015-06-03 12:03:00 +01:00
19ac70fc2f Added unit tests for SSL. 2015-06-03 13:15:45 +03:00
6e803c647b Fix bugs, try different arrangement of dcb_close code. 2015-06-03 10:02:27 +01:00
18a39e6c64 Addition of server_update_address/port 2015-06-03 10:24:35 +02:00
72d14f8894 Addition of server_update_address/port 2015-06-03 10:15:54 +02:00
cedaeb7fe9 MariaDB10 embedded library version string
MariaDB10 embedded library version string
2015-06-03 09:41:12 +02:00
1a76fc141d Add configuration capabilities for persistent connections. 2015-06-02 15:44:57 +01:00
57060cafec Added SSL level configuration to services. 2015-06-02 17:16:53 +03:00
a5de4fc503 Merge branch 'develop' into MXS-129 2015-06-02 12:21:05 +03:00
94ba445d2f Added 5.5.5- string to the start of MariaDB 10.0 version strings. 2015-06-02 10:57:25 +03:00
fc8918b1f2 Added a dcb_connect_SSL function which starts a client SSL connection. 2015-06-02 09:15:08 +03:00
76655e7136 Added a call to a library function which adds all algorithms to OpenSSL to the SSL initialization code. 2015-06-02 06:04:06 +03:00
d7232d8b6e Moved SSL structure to the DCB instead of the MySQL protocol.
This allows for non-MySQL SSL connections.
2015-06-01 20:51:26 +03:00
739ea82e36 Clean up modifications. 2015-06-01 14:05:31 +01:00
a2768955e7 SSL handshake now successfully completes when a client connects with SSL enabled. 2015-06-01 13:50:22 +03:00
0f814d3e73 Added SSL write and read functions. 2015-05-29 13:00:37 +03:00
a572166ffd Added ssl handshake to mysql_client 2015-05-28 22:19:50 +03:00
3d6259cb00 Added configuration options for different SSL modes. 2015-05-28 16:33:51 +03:00
f54fcc7e4e changed stop/start slave error message
changed stop/start slave error message including
errors code and status message

ERROR 1254 (HY000): Slave connection is already running
ERROR 1199 (HY000): Slave connection is not running
2015-05-28 11:14:59 +02:00
16d6bd6d2c Added service SSL mode variables. 2015-05-28 11:56:14 +03:00
4365a04d2c Added 5.5.5- string to the start of MariaDB 10.0 version strings. 2015-05-28 10:30:21 +03:00
e5b4984a12 Fix bugs. 2015-05-27 16:56:53 +01:00
23e9a7b4e2 Try out some more changes. 2015-05-27 16:41:06 +01:00
6c5e6a5959 Move code around to fix headers problem etc. 2015-05-27 10:17:35 +01:00