client: add command line support for ciphers, ca file, and host certificate subject #573371spice-client-0.4.2-2.el6

1 files changed, 5 insertions, 2 deletions

diff --git a/client/red_client.cpp b/client/red_client.cpp
index df88e7a8..90793266 100644
--- a/client/red_client.cpp
+++ b/client/red_client.cpp
@@ -129,14 +129,15 @@ void Migrate::run()
     DBG(0, "");
     try {
         conn_type = _client.get_connection_options(RED_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;
@@ -186,6 +187,7 @@ void Migrate::start(const RedMigrationBegin* migrate)
                                          migrate->pub_key_size);
     }
 
+    _con_ciphers = _client.get_connection_ciphers();
     _password = _client._password;
     Lock lock(_lock);
     _running = true;
@@ -410,6 +412,7 @@ void RedClient::connect()
     }
 
     _host_auth_opt = _application.get_host_auth_opt();
+    _con_ciphers = _application.get_connection_ciphers();
     RedChannel::connect();
 }