2 files changed, 56 insertions, 4 deletions
diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificateFactory.cpp b/Swiften/TLS/OpenSSL/OpenSSLCertificateFactory.cpp
new file mode 100644
index 0000000..c94702c
--- /dev/null
+++ b/Swiften/TLS/OpenSSL/OpenSSLCertificateFactory.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <Swiften/TLS/OpenSSL/OpenSSLCertificateFactory.h>
+
+#include <openssl/pem.h>
+
+namespace Swift {
+
+OpenSSLCertificateFactory::OpenSSLCertificateFactory() {
+}
+
+OpenSSLCertificateFactory::~OpenSSLCertificateFactory() {
+}
+
+Certificate* OpenSSLCertificateFactory::createCertificateFromDER(const ByteArray& der) {
+    return new OpenSSLCertificate(der);
+}
+
+std::vector<Certificate::ref> OpenSSLCertificateFactory::createCertificateChain(const ByteArray& data) {
+    std::vector<Certificate::ref> certificateChain;
+
+    if (data.size() > std::numeric_limits<int>::max()) {
+        return certificateChain;
+    }
+
+    auto bio = std::shared_ptr<BIO>(BIO_new(BIO_s_mem()), BIO_free);
+    BIO_write(bio.get(), vecptr(data), int(data.size()));
+
+    // Attempt parsing data as PEM
+    X509* openSSLCert = nullptr;
+    auto x509certFromPEM = PEM_read_bio_X509(bio.get(), &openSSLCert, nullptr, nullptr);
+    if (x509certFromPEM && openSSLCert) {
+        std::shared_ptr<X509> x509Cert(openSSLCert, X509_free);
+        certificateChain.push_back(std::make_shared<OpenSSLCertificate>(x509Cert));
+        openSSLCert = nullptr;
+        while ((x509certFromPEM = PEM_read_bio_X509(bio.get(), &openSSLCert, nullptr, nullptr)) != nullptr) {
+            std::shared_ptr<X509> x509Cert(openSSLCert, X509_free);
+            certificateChain.push_back(std::make_shared<OpenSSLCertificate>(x509Cert));
+            openSSLCert = nullptr;
+        }
+    }
+
+    return certificateChain;
+}
+
+}
diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificateFactory.h b/Swiften/TLS/OpenSSL/OpenSSLCertificateFactory.h
index c996cd5..af45a33 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLCertificateFactory.h
+++ b/Swiften/TLS/OpenSSL/OpenSSLCertificateFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -12,8 +12,10 @@
 namespace Swift {
     class OpenSSLCertificateFactory : public CertificateFactory {
         public:
-            virtual Certificate* createCertificateFromDER(const ByteArray& der) {
-                return new OpenSSLCertificate(der);
-            }
+            OpenSSLCertificateFactory();
+            virtual ~OpenSSLCertificateFactory() override final;
+
+            virtual Certificate* createCertificateFromDER(const ByteArray& der) override final;
+            virtual std::vector<Certificate::ref> createCertificateChain(const ByteArray& data) override final;
     };
 }