diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-24 01:59:03 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-24 01:59:03 +0100 |
| commit | b7cf6abe521160a9b9a905df3bdfe134f1336d39 (patch) | |
| tree | 039c60119e2569a7e186def9a924b67478eab429 /vio | |
| parent | c492296127b55f35f4dd78ba8829b65d3a5c0740 (diff) | |
| parent | 19d13a3b17d613c04acbcd8c7a0578a55e0c2938 (diff) | |
| download | mariadb-git-b7cf6abe521160a9b9a905df3bdfe134f1336d39.tar.gz | |
merge
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosocket.c | 2 | ||||
| -rw-r--r-- | vio/viosslfactories.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 1f129cb8e55..b554eec7d4f 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2001, 2011, Oracle and/or its affiliates This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 7c9269de853..f64869e905d 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -284,7 +284,8 @@ new_VioSSLAcceptorFd(const char *key_file, const char *cert_file, struct st_VioSSLFd *ssl_fd; int verify= SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE; if (!(ssl_fd= new_VioSSLFd(key_file, cert_file, ca_file, - ca_path, cipher, TLSv1_server_method(), error))) + ca_path, cipher, + (SSL_METHOD*) TLSv1_server_method(), error))) { return 0; } |