diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-29 11:38:48 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-29 11:38:48 +0200 |
| commit | 8cdaf6ef1c783e466769c4e3a7ac258cb3b23e4a (patch) | |
| tree | 4b3bc285f56cfa295ed268ca03ffff1150edc101 /vio | |
| parent | 4000a6a6fbc73847d9a4ec8ed7cba73cacee26fe (diff) | |
| parent | 40df5f68b53b67514cf45c4b7d241b8f31d5f368 (diff) | |
| download | mariadb-git-8cdaf6ef1c783e466769c4e3a7ac258cb3b23e4a.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309
into pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
vio/viosslfactories.c:
Auto merged
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosslfactories.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 9b407d08b3b..5d7d722f0c9 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -301,6 +301,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()))) { |