protocol:

	renamed some vars to avoid collision with openssl
client-qt:
	implemented ssl support
	some work on connect_widget

1 files changed, 8 insertions, 2 deletions

diff --git a/client-qt/udm-client-qt/client_session.h b/client-qt/udm-client-qt/client_session.h
index df75640..d50c972 100644
--- a/client-qt/udm-client-qt/client_session.h
+++ b/client-qt/udm-client-qt/client_session.h
@@ -26,6 +26,7 @@
 //boost.asio here, yes i know about qtnetwork, but i have more exp with boost asio
 
 #include <boost/asio.hpp>
+#include <boost/asio/ssl.hpp>
 #include <QObject>
 #include "../../protocol/udm.pb.h"
 
@@ -52,17 +53,22 @@ signals:
 
 public slots:
     void client_connect(QString host, QString password, int port);
-    void run_io_service();
+    void client_connect_ssl(QString host, QString password, int port, QString ssl_ca, QString ssl_crt, QString ssl_key);
     void send_message(client_msg &msg);
 
 private:
     void handle_connect(const boost::system::error_code &error);
     void handle_read(const boost::system::error_code& error, size_t bytes_transferred);
     void handle_write(const boost::system::error_code& error);
+    bool verify_certificate(bool preverified,boost::asio::ssl::verify_context& ctx);
+
+    bool ssl_enabled;
     char *recv_data_;
     boost::asio::io_service &io_service_;
-    tcp::socket socket_;
+    tcp::socket *socket_;
+    boost::asio::ssl::stream<boost::asio::ip::tcp::socket> *socket_ssl_;
     QString pasword;
+    QByteArray password_sha512;
 };
 
 #endif // CLIENT_SESSION_H