From 62f8dc198d0dc8e1c7738ed99b1c123f62b2f1cb Mon Sep 17 00:00:00 2001
From: Valerii Sosliuk <valerii.sosliuk@gmail.com>
Date: Fri, 13 Jan 2017 18:45:48 -0500
Subject: [PATCH] X509 cert saved in db

---
 application/src/main/resources/thingsboard.yml         |  9 +++++----
 .../server/transport/mqtt/MqttSslHandlerProvider.java  | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 288914822d..fe3979a50f 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -76,10 +76,11 @@ mqtt:
   adaptor: "${MQTT_ADAPTOR_NAME:JsonMqttAdaptor}"
   timeout: "${MQTT_TIMEOUT:10000}"
 # Uncomment the following lines to enable ssl for MQTT
-  ssl:
-    key_store: keystore/mqttserver.jks
-    key_store_password: password
-    key_store_type: JKS
+#  ssl:
+#    key_store: keystore/mqttserver.jks
+#    key_store_password: server_ks_password
+#    key_password: server_key_password
+#    key_store_type: JKS
 
 # CoAP server parameters
 coap:
diff --git a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProvider.java b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProvider.java
index da478ebd40..d7a19f5662 100644
--- a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProvider.java
+++ b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProvider.java
@@ -1,12 +1,12 @@
 /**
  * Copyright © 2016-2017 The Thingsboard Authors
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,7 +51,7 @@ public class MqttSslHandlerProvider {
     private String keyStorePassword;
     @Value("${mqtt.ssl.key_store_type}")
     private String keyStoreType;
-
+    
     @Autowired
     private DeviceCredentialsService deviceCredentialsService;