diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-11 23:50:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-11 23:50:40 +0100 |
| commit | 8e80f91fa3e584d6b681bfbb4664e80a255af866 (patch) | |
| tree | af4f13f6f0290ee72b33a0642aa7c03e4e5fcd1c /vio/viosslfactories.c | |
| parent | 63108dc9d2cc9f31ae9927817652be465a17f767 (diff) | |
| parent | 3ee8aa216d55b858ba9e53874359dcac9a82933a (diff) | |
| download | mariadb-git-8e80f91fa3e584d6b681bfbb4664e80a255af866.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42
Diffstat (limited to 'vio/viosslfactories.c')
| -rw-r--r-- | vio/viosslfactories.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 22645b18b1b..41c1dbbd0e4 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. + Copyright (c) 2011, 2015, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -173,6 +174,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file, { DH *dh; struct st_VioSSLFd *ssl_fd; + long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; DBUG_ENTER("new_VioSSLFd"); DBUG_PRINT("enter", ("key_file: '%s' cert_file: '%s' ca_file: '%s' ca_path: '%s' " @@ -200,7 +202,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file, DBUG_RETURN(0); } - SSL_CTX_set_options(ssl_fd->ssl_context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); + SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options); /* Set the ciphers that can be used |