diff options
author | Yonit Halperin <yhalperi@redhat.com> | 2010-03-18 10:21:47 +0100 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2010-03-18 10:21:47 +0100 |
commit | 457693fcfac7c178bdc9ca23295aa52d815ea0d6 (patch) | |
tree | f3176bcb321373b2f8974f6dcdeceb4082dba0cf /client/red_client.cpp | |
parent | f16e16393e128a335b5e2d22c21315881409e99f (diff) | |
download | spice-457693fcfac7c178bdc9ca23295aa52d815ea0d6.tar.gz spice-457693fcfac7c178bdc9ca23295aa52d815ea0d6.tar.xz spice-457693fcfac7c178bdc9ca23295aa52d815ea0d6.zip |
client: add command line support for ciphers, ca file, and host certificate subject
Diffstat (limited to 'client/red_client.cpp')
-rw-r--r-- | client/red_client.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/red_client.cpp b/client/red_client.cpp index 40c77677..6a83a051 100644 --- a/client/red_client.cpp +++ b/client/red_client.cpp @@ -170,14 +170,15 @@ void Migrate::run() DBG(0, ""); try { conn_type = _client.get_connection_options(SPICE_CHANNEL_MAIN); - RedPeer::ConnectionOptions con_opt(conn_type, _port, _sport, _auth_options); + RedPeer::ConnectionOptions con_opt(conn_type, _port, _sport, _auth_options, _con_ciphers); MigChannels::iterator iter = _channels.begin(); connection_id = _client.get_connection_id(); connect_one(**iter, con_opt, connection_id); for (++iter; iter != _channels.end(); ++iter) { conn_type = _client.get_connection_options((*iter)->get_type()); - con_opt = RedPeer::ConnectionOptions(conn_type, _port, _sport, _auth_options); + con_opt = RedPeer::ConnectionOptions(conn_type, _port, _sport, + _auth_options, _con_ciphers); connect_one(**iter, con_opt, connection_id); } _connected = true; @@ -227,6 +228,7 @@ void Migrate::start(const SpiceMsgMainMigrationBegin* migrate) migrate->pub_key_size); } + _con_ciphers = _client.get_connection_ciphers(); _password = _client._password; Lock lock(_lock); _running = true; @@ -460,6 +462,7 @@ void RedClient::connect() } _host_auth_opt = _application.get_host_auth_opt(); + _con_ciphers = _application.get_connection_ciphers(); RedChannel::connect(); } |