From c5faa8de2464efd4a8f54f6ef400013b13500424 Mon Sep 17 00:00:00 2001
From: Serhii Hadzhilov <serhii-external@symless.com>
Date: Fri, 27 Aug 2021 15:18:09 +0300
Subject: [PATCH 1/3] SYNERGY-1057 Add trace if the system can't open file with
 trusted fingerprints

---
 src/lib/net/SecureSocket.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index 6cb66bec1..5da403d89 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -709,15 +709,20 @@ SecureSocket::verifyCertFingerprint()
     file.open(trustedServersFilename.c_str());
 
     bool isValid = false;
-    while (!file.eof() && file.is_open()) {
-        getline(file,fileLine);
-        if (!fileLine.empty()) {
-            if (fileLine.compare(fingerprint) == 0) {
-                isValid = true;
-                break;
+    if (file.is_open()) {
+        while (!file.eof()) {
+            getline(file,fileLine);
+            if (!fileLine.empty()) {
+                if (fileLine.compare(fingerprint) == 0) {
+                    isValid = true;
+                    break;
+                }
             }
         }
     }
+    else {
+        LOG((CLOG_ERR "Fail to open trusted fingerprints file: %s", trustedServersFilename.c_str()));
+    }
 
     file.close();
     return isValid;

From 9340f1ffafb629f586c29b4c6fea62b3a6febd0f Mon Sep 17 00:00:00 2001
From: Serhii Hadzhilov <serhii-external@symless.com>
Date: Fri, 27 Aug 2021 15:23:01 +0300
Subject: [PATCH 2/3] SYNERGY-1057 Update ChangeLog.txt

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 23b29545e..492ef213f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Bug fixes:
 - #7070 Fix radio button shifted focus on macOS
 - #7078 Fix clipboard re-enables automatically
 - #7077 Fix Ubuntu, CentOS and Debian build after SYNERGY-1161
+- #7080 Add trace if the system can't open file with trusted fingerprints
 
 Enhancements:
 - #7068 Add Synergy restart when settings changed

From e52d7cc26a558ba566e45bf1cf9088ff52fbdec7 Mon Sep 17 00:00:00 2001
From: Serhii Hadzhilov <serhii-external@symless.com>
Date: Fri, 27 Aug 2021 15:49:06 +0300
Subject: [PATCH 3/3] SYNERGY-1057 Fix code smell

---
 src/lib/net/SecureSocket.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index 5da403d89..7676132ad 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -712,11 +712,9 @@ SecureSocket::verifyCertFingerprint()
     if (file.is_open()) {
         while (!file.eof()) {
             getline(file,fileLine);
-            if (!fileLine.empty()) {
-                if (fileLine.compare(fingerprint) == 0) {
-                    isValid = true;
-                    break;
-                }
+            if (!fileLine.empty() && !fileLine.compare(fingerprint)) {
+                isValid = true;
+                break;
             }
         }
     }