Update upstream source from tag 'upstream/2.4.0+dfsg'

Update to upstream version '2.4.0+dfsg'
with Debian dir 4b6668cc08c7b0e56b1e1f7b4e89ecdb316182a0

1 files changed, 37 insertions, 4 deletions

diff --git a/src/lib/common/DataDirectories_static.cpp b/src/lib/common/DataDirectories_static.cpp
index 48dccb6..47f88e7 100644
--- a/src/lib/common/DataDirectories_static.cpp
+++ b/src/lib/common/DataDirectories_static.cpp
@@ -17,7 +17,40 @@
 
 #include "DataDirectories.h"
 
-// static member
-std::string DataDirectories::_profile;
-std::string DataDirectories::_global;
-std::string DataDirectories::_systemconfig;
+namespace barrier {
+
+fs::path DataDirectories::_profile;
+fs::path DataDirectories::_global;
+fs::path DataDirectories::_systemconfig;
+
+static const char kFingerprintsDirName[] = "SSL/Fingerprints";
+static const char kFingerprintsLocalFilename[] = "Local.txt";
+static const char kFingerprintsTrustedServersFilename[] = "TrustedServers.txt";
+static const char kFingerprintsTrustedClientsFilename[] = "TrustedClients.txt";
+
+fs::path DataDirectories::ssl_fingerprints_path()
+{
+    return profile() / kFingerprintsDirName;
+}
+
+fs::path DataDirectories::local_ssl_fingerprints_path()
+{
+    return ssl_fingerprints_path() / kFingerprintsLocalFilename;
+}
+
+fs::path DataDirectories::trusted_servers_ssl_fingerprints_path()
+{
+    return ssl_fingerprints_path() / kFingerprintsTrustedServersFilename;
+}
+
+fs::path DataDirectories::trusted_clients_ssl_fingerprints_path()
+{
+    return ssl_fingerprints_path() / kFingerprintsTrustedClientsFilename;
+}
+
+fs::path DataDirectories::ssl_certificate_path()
+{
+    return profile() / "SSL" / "Barrier.pem";
+}
+
+} // namespace barrier