summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-03-29 11:48:05 +0200
committermsvensson@pilot.blaudden <>2007-03-29 11:48:05 +0200
commitcb806be68d15c6ea188057a0ee029fc48c21c6fe (patch)
tree58c785cfb0b77b3d873aede49cf158b9aa4bfd89 /vio
parent37ffc0c391948ea58fd1385d91d706d7b4804103 (diff)
parentf47c4368dedc320ffaea7736e4908f7a96281da2 (diff)
downloadmariadb-git-cb806be68d15c6ea188057a0ee029fc48c21c6fe.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'vio')
-rw-r--r--vio/viosslfactories.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index e4d856624d3..d318f1b0122 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -309,6 +309,14 @@ new_VioSSLConnectorFd(const char *key_file, const char *cert_file,
{
struct st_VioSSLFd *ssl_fd;
int verify= SSL_VERIFY_PEER;
+
+ /*
+ Turn off verification of servers certificate if both
+ ca_file and ca_path is set to NULL
+ */
+ if (ca_file == 0 && ca_path == 0)
+ verify= SSL_VERIFY_NONE;
+
if (!(ssl_fd= new_VioSSLFd(key_file, cert_file, ca_file,
ca_path, cipher, TLSv1_client_method())))
{