2 files changed, 19 insertions, 10 deletions
diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
index 7f13f88..77c0aee 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
@@ -35,14 +35,22 @@ ByteArray OpenSSLCertificate::toDER() const {
 }
 
 void OpenSSLCertificate::parse() {
-	// Common name
+	// Subject name
 	X509_NAME* subjectName = X509_get_subject_name(cert.get());
 	if (subjectName) {
+		// Subject name
+		ByteArray subjectNameData;
+		subjectNameData.resize(256);
+		X509_NAME_oneline(X509_get_subject_name(cert.get()), subjectNameData.getData(), subjectNameData.getSize());
+		this->subjectName = String(subjectNameData.getData());
+
+		// Common name
 		int cnLoc = X509_NAME_get_index_by_NID(subjectName, NID_commonName, -1);
-		if (cnLoc != -1) {
+		while (cnLoc != -1) {
 			X509_NAME_ENTRY* cnEntry = X509_NAME_get_entry(subjectName, cnLoc);
 			ASN1_STRING* cnData = X509_NAME_ENTRY_get_data(cnEntry);
-			setCommonName(ByteArray(cnData->data, cnData->length).toString());
+			commonNames.push_back(ByteArray(cnData->data, cnData->length).toString());
+			cnLoc = X509_NAME_get_index_by_NID(subjectName, NID_commonName, cnLoc);
 		}
 	}
 
diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificate.h b/Swiften/TLS/OpenSSL/OpenSSLCertificate.h
index fe2cddf..ad16081 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLCertificate.h
+++ b/Swiften/TLS/OpenSSL/OpenSSLCertificate.h
@@ -18,8 +18,12 @@ namespace Swift {
 			OpenSSLCertificate(boost::shared_ptr<X509>);
 			OpenSSLCertificate(const ByteArray& der);
 
-			String getCommonName() const {
-				return commonName;
+			String getSubjectName() const {
+				return subjectName;
+			}
+
+			std::vector<String> getCommonNames() const {
+				return commonNames;
 			}
 
 			std::vector<String> getSRVNames() const {
@@ -51,13 +55,10 @@ namespace Swift {
 				xmppAddresses.push_back(addr);
 			}
 
-			void setCommonName(const String& commonName) {
-				this->commonName = commonName;
-			}
-
 		private:
 			boost::shared_ptr<X509> cert;
-			String commonName;
+			String subjectName;
+			std::vector<String> commonNames;
 			std::vector<String> dnsNames;
 			std::vector<String> xmppAddresses;
 			std::vector<String> srvNames;