3 files changed, 27 insertions, 0 deletions
diff --git a/Swiften/TLS/Certificate.h b/Swiften/TLS/Certificate.h
index 3a812a8..6b62457 100644
--- a/Swiften/TLS/Certificate.h
+++ b/Swiften/TLS/Certificate.h
@@ -9,6 +9,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "Swiften/Base/String.h"
+#include "Swiften/Base/ByteArray.h"
 
 namespace Swift {
 	class Certificate {
@@ -22,6 +23,8 @@ namespace Swift {
 			virtual std::vector<String> getDNSNames() const = 0;
 			virtual std::vector<String> getXMPPAddresses() const = 0;
 
+			virtual ByteArray toDER() const = 0;
+
 		protected:
 			static const char* ID_ON_XMPPADDR_OID;
 			static const char* ID_ON_DNSSRV_OID;
diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
index 3f134e7..7f13f88 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
@@ -16,6 +16,25 @@
 namespace Swift {
 
 OpenSSLCertificate::OpenSSLCertificate(boost::shared_ptr<X509> cert) : cert(cert) {
+	parse();
+}
+
+
+OpenSSLCertificate::OpenSSLCertificate(const ByteArray& der) {
+	const unsigned char* p = reinterpret_cast<const unsigned char*>(der.getData());
+	cert = boost::shared_ptr<X509>(d2i_X509(NULL, &p, der.getSize()), X509_free);
+	parse();
+}
+
+ByteArray OpenSSLCertificate::toDER() const {
+	ByteArray result;
+	result.resize(i2d_X509(cert.get(), NULL));
+	unsigned char* p = reinterpret_cast<unsigned char*>(result.getData());
+	i2d_X509(cert.get(), &p);
+	return result;
+}
+
+void OpenSSLCertificate::parse() {
 	// Common name
 	X509_NAME* subjectName = X509_get_subject_name(cert.get());
 	if (subjectName) {
diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificate.h b/Swiften/TLS/OpenSSL/OpenSSLCertificate.h
index 4708120..fe2cddf 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLCertificate.h
+++ b/Swiften/TLS/OpenSSL/OpenSSLCertificate.h
@@ -16,6 +16,7 @@ namespace Swift {
 	class OpenSSLCertificate : public Certificate {
 		public:
 			OpenSSLCertificate(boost::shared_ptr<X509>);
+			OpenSSLCertificate(const ByteArray& der);
 
 			String getCommonName() const {
 				return commonName;
@@ -33,7 +34,11 @@ namespace Swift {
 				return xmppAddresses;
 			}
 
+			ByteArray toDER() const;
+
 		private:
+			void parse();
+
 			void addSRVName(const String& name) {
 				srvNames.push_back(name);
 			}