Rework TLS configuration to allow disablingsalmon

Rework TLS configuration to add an explicit "use-tls" option like
newer clients have, and to make using a CA certificate optional
to allow potentially using issued certificates.  The new option
defaults to TLS disabled, which is a breaking change for most
existing configuration files.

Bug-AGL: SPEC-5387

Change-Id: I1e18ffb05c89bd05aba87b39bcfba439cbeb02e5
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/vehicle-signals/VehicleSignalsConfig.h b/vehicle-signals/VehicleSignalsConfig.h
index c3d52ca..a51900c 100644
--- a/vehicle-signals/VehicleSignalsConfig.h
+++ b/vehicle-signals/VehicleSignalsConfig.h
@@ -16,6 +16,8 @@ class VehicleSignalsConfig
 public:
         explicit VehicleSignalsConfig(const QString &hostname,
 				      const unsigned port,
+				      const bool useTls,
+				      const QString &caCertFileName,
 				      const QByteArray &caCert,
 				      const QString &tlsServerName,
 				      const QString &authToken);
@@ -24,6 +26,8 @@ public:
 
 	QString hostname() { return m_hostname; };
 	unsigned port() { return m_port; };
+	bool useTls() { return m_useTls; };
+	QString caCertFileName() { return m_caCertFileName; };
 	QByteArray caCert() { return m_caCert; };
 	QString tlsServerName() { return m_tlsServerName; };
 	QString authToken() { return m_authToken; };
@@ -33,6 +37,8 @@ public:
 private:
 	QString m_hostname;
 	unsigned m_port;
+	bool m_useTls;
+	QString m_caCertFileName;
 	QByteArray m_caCert;
 	QString m_tlsServerName;
 	QString m_authToken;