diff options
Diffstat (limited to 'vswitchd')
| -rw-r--r-- | vswitchd/bridge.c | 8 | ||||
| -rw-r--r-- | vswitchd/ovs-vswitchd.c | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 4cf1b86f8..ea8161ffa 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -52,12 +52,12 @@ #include "sha1.h" #include "shash.h" #include "socket-util.h" +#include "stream-ssl.h" #include "svec.h" #include "timeval.h" #include "util.h" #include "unixctl.h" #include "vconn.h" -#include "vconn-ssl.h" #include "vswitchd/vswitch-idl.h" #include "xenserver.h" #include "xtoxll.h" @@ -366,11 +366,11 @@ bridge_configure_ssl(const struct ovsrec_ssl *ssl) } if (config_string_change(ssl->private_key, &private_key_file)) { - vconn_ssl_set_private_key_file(private_key_file); + stream_ssl_set_private_key_file(private_key_file); } if (config_string_change(ssl->certificate, &certificate_file)) { - vconn_ssl_set_certificate_file(certificate_file); + stream_ssl_set_certificate_file(certificate_file); } /* We assume that even if the filename hasn't changed, if the CA cert @@ -380,7 +380,7 @@ bridge_configure_ssl(const struct ovsrec_ssl *ssl) * restarted. We may want to address this in vconn's SSL library. */ if (config_string_change(ssl->ca_cert, &cacert_file) || (cacert_file && stat(cacert_file, &s) && errno == ENOENT)) { - vconn_ssl_set_ca_cert_file(cacert_file, ssl->bootstrap_ca_cert); + stream_ssl_set_ca_cert_file(cacert_file, ssl->bootstrap_ca_cert); } } #endif diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 606285df6..1d1fa291f 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -36,12 +36,12 @@ #include "proc-net-compat.h" #include "process.h" #include "signals.h" +#include "stream-ssl.h" #include "stream.h" #include "svec.h" #include "timeval.h" #include "unixctl.h" #include "util.h" -#include "vconn-ssl.h" #include "vconn.h" #include "vswitchd/vswitch-idl.h" @@ -148,7 +148,7 @@ parse_options(int argc, char *argv[]) VLOG_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS, #ifdef HAVE_OPENSSL - VCONN_SSL_LONG_OPTIONS + STREAM_SSL_LONG_OPTIONS {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, #endif {0, 0, 0, 0}, @@ -183,12 +183,13 @@ parse_options(int argc, char *argv[]) VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS - VCONN_SSL_OPTION_HANDLERS LEAK_CHECKER_OPTION_HANDLERS #ifdef HAVE_OPENSSL + STREAM_SSL_OPTION_HANDLERS + case OPT_PEER_CA_CERT: - vconn_ssl_set_peer_ca_cert_file(optarg); + stream_ssl_set_peer_ca_cert_file(optarg); break; #endif |