summaryrefslogtreecommitdiff
path: root/vio/viosslfactories.c
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2003-06-26 12:47:36 +0500
committerunknown <gluh@gluh.mysql.r18.ru>2003-06-26 12:47:36 +0500
commita61b679d3e6f4f5d4634a883ce3b4e4c7a722758 (patch)
tree1cba43db3b6011169f56cf4992aa49eca9167fdf /vio/viosslfactories.c
parent4eef86c60b0439eb612c2d3ab764c10f8e6cd0c1 (diff)
downloadmariadb-git-a61b679d3e6f4f5d4634a883ce3b4e4c7a722758.tar.gz
Fix bug #673: MySQL 4.0.13 no SSL connection with mysql client possible
sql/sql_acl.cc: Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible vio/viossl.c: Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible vio/viosslfactories.c: Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
Diffstat (limited to 'vio/viosslfactories.c')
-rw-r--r--vio/viosslfactories.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index 31bc457d1ae..72ac915d14e 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -178,6 +178,11 @@ vio_verify_callback(int ok, X509_STORE_CTX *ctx)
/************************ VioSSLConnectorFd **********************************/
+/*
+ TODO:
+ Add option --verify to mysql to be able to change verification mode
+*/
+
struct st_VioSSLConnectorFd *
new_VioSSLConnectorFd(const char* key_file,
const char* cert_file,
@@ -185,7 +190,7 @@ new_VioSSLConnectorFd(const char* key_file,
const char* ca_path,
const char* cipher)
{
- int verify = SSL_VERIFY_PEER;
+ int verify = SSL_VERIFY_NONE;
struct st_VioSSLConnectorFd* ptr;
int result;
DH *dh=NULL;
@@ -264,7 +269,10 @@ ctor_failure:
/************************ VioSSLAcceptorFd **********************************/
-
+/*
+ TODO:
+ Add option --verify to mysqld to be able to change verification mode
+*/
struct st_VioSSLAcceptorFd*
new_VioSSLAcceptorFd(const char *key_file,
const char *cert_file,
@@ -273,7 +281,6 @@ new_VioSSLAcceptorFd(const char *key_file,
const char *cipher)
{
int verify = (SSL_VERIFY_PEER |
- SSL_VERIFY_FAIL_IF_NO_PEER_CERT |
SSL_VERIFY_CLIENT_ONCE);
struct st_VioSSLAcceptorFd* ptr;
int result;