diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-29 11:48:05 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-29 11:48:05 +0200 |
| commit | 677b29cc497539a87c132cdca731224491f82a00 (patch) | |
| tree | 58c785cfb0b77b3d873aede49cf158b9aa4bfd89 /vio | |
| parent | e4f4827454e44ddd33f8955635548faec99ffa34 (diff) | |
| parent | 8cdaf6ef1c783e466769c4e3a7ac258cb3b23e4a (diff) | |
| download | mariadb-git-677b29cc497539a87c132cdca731224491f82a00.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
mysql-test/t/openssl_1.test:
Auto merged
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 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()))) { |