1 files changed, 41 insertions, 35 deletions
diff --git a/Swift/Controllers/Storages/CertificateFileStorage.cpp b/Swift/Controllers/Storages/CertificateFileStorage.cpp
index 34d1f76..a8661df 100644
--- a/Swift/Controllers/Storages/CertificateFileStorage.cpp
+++ b/Swift/Controllers/Storages/CertificateFileStorage.cpp
@@ -1,19 +1,20 @@
 /*
- * Copyright (c) 2010-2013 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2019 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Storages/CertificateFileStorage.h>
 
 #include <iostream>
+
 #include <boost/filesystem/fstream.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
-#include <Swiften/StringCodecs/Hexify.h>
-#include <Swiften/TLS/CertificateFactory.h>
 #include <Swiften/Base/Log.h>
 #include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/StringCodecs/Hexify.h>
+#include <Swiften/TLS/CertificateFactory.h>
 
 namespace Swift {
 
@@ -21,42 +22,47 @@ CertificateFileStorage::CertificateFileStorage(const boost::filesystem::path& pa
 }
 
 bool CertificateFileStorage::hasCertificate(Certificate::ref certificate) const {
-	boost::filesystem::path certificatePath = getCertificatePath(certificate);
-	if (boost::filesystem::exists(certificatePath)) {
-		ByteArray data;
-		readByteArrayFromFile(data, certificatePath);
-		Certificate::ref storedCertificate = certificateFactory->createCertificateFromDER(data);
-		if (storedCertificate && storedCertificate->toDER() == certificate->toDER()) {
-			return true;
-		}
-		else {
-			SWIFT_LOG(warning) << "Stored certificate does not match received certificate" << std::endl;
-			return false;
-		}
-	}
-	else {
-		return false;
-	}
+    boost::filesystem::path certificatePath = getCertificatePath(certificate);
+    if (boost::filesystem::exists(certificatePath)) {
+        ByteArray data;
+        readByteArrayFromFile(data, certificatePath);
+        Certificate::ref storedCertificate(certificateFactory->createCertificateFromDER(data));
+        if (storedCertificate && storedCertificate->toDER() == certificate->toDER()) {
+            return true;
+        }
+        else {
+            SWIFT_LOG(warning) << "Stored certificate does not match received certificate";
+            return false;
+        }
+    }
+    else {
+        return false;
+    }
 }
 
 void CertificateFileStorage::addCertificate(Certificate::ref certificate) {
-	boost::filesystem::path certificatePath = getCertificatePath(certificate);
-	if (!boost::filesystem::exists(certificatePath.parent_path())) {
-		try {
-			boost::filesystem::create_directories(certificatePath.parent_path());
-		}
-		catch (const boost::filesystem::filesystem_error& e) {
-			std::cerr << "ERROR: " << e.what() << std::endl;
-		}
-	}
-	boost::filesystem::ofstream file(certificatePath, boost::filesystem::ofstream::binary|boost::filesystem::ofstream::out);
-	ByteArray data = certificate->toDER();
-	file.write(reinterpret_cast<const char*>(vecptr(data)), boost::numeric_cast<std::streamsize>(data.size()));
-	file.close();
+    boost::filesystem::path certificatePath = getCertificatePath(certificate);
+    if (!boost::filesystem::exists(certificatePath.parent_path())) {
+        try {
+            boost::filesystem::create_directories(certificatePath.parent_path());
+        }
+        catch (const boost::filesystem::filesystem_error& e) {
+            std::cerr << "ERROR: " << e.what() << std::endl;
+        }
+    }
+    try {
+        boost::filesystem::ofstream file(certificatePath, boost::filesystem::ofstream::binary|boost::filesystem::ofstream::out);
+        ByteArray data = certificate->toDER();
+        file.write(reinterpret_cast<const char*>(vecptr(data)), boost::numeric_cast<std::streamsize>(data.size()));
+        file.close();
+    }
+    catch (...) {
+        SWIFT_LOG(warning) << "Failed to store certificate to " << certificatePath;
+    }
 }
 
 boost::filesystem::path CertificateFileStorage::getCertificatePath(Certificate::ref certificate) const {
-	return path / Hexify::hexify(crypto->getSHA1Hash(certificate->toDER()));
+    return path / Hexify::hexify(crypto->getSHA1Hash(certificate->toDER()));
 }
 
 }