From: cantor <cantor@de75baf8-a10c-0410-a50a-987c0e22f00f>
Date: Wed, 4 Jun 2008 16:58:03 +0000 (+0000)
Subject: Pull isser/serial from KeyInfo until I can make it configurable.
X-Git-Tag: 1.4.1~332
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fxmltooling.git;a=commitdiff_plain;h=e3b400c1ee8b4cc747e676c0eb5e99dd8796aeab

Pull isser/serial from KeyInfo until I can make it configurable.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/branches/REL_1@497 de75baf8-a10c-0410-a50a-987c0e22f00f
---

diff --git a/xmltooling/security/impl/BasicX509Credential.cpp b/xmltooling/security/impl/BasicX509Credential.cpp
index f6bd596..b9678ff 100644
--- a/xmltooling/security/impl/BasicX509Credential.cpp
+++ b/xmltooling/security/impl/BasicX509Credential.cpp
@@ -63,7 +63,8 @@ void BasicX509Credential::initKeyInfo()
         }
     }
 
-    if (!m_subjectName.empty() || (!m_issuerName.empty() && !m_serial.empty())) {
+//  if (!m_subjectName.empty() || (!m_issuerName.empty() && !m_serial.empty())) {
+    if (!m_subjectName.empty()) {
         if (!m_compactKeyInfo)
             m_compactKeyInfo = KeyInfoBuilder::buildKeyInfo();
         X509Data* x509Data=X509DataBuilder::buildX509Data();
@@ -74,7 +75,7 @@ void BasicX509Credential::initKeyInfo()
             sn->setName(wide.get());
             x509Data->getX509SubjectNames().push_back(sn);
         }
-        
+/*        
         if (!m_issuerName.empty() && !m_serial.empty()) {
             X509IssuerSerial* is = X509IssuerSerialBuilder::buildX509IssuerSerial();
             X509IssuerName* in = X509IssuerNameBuilder::buildX509IssuerName();
@@ -87,6 +88,7 @@ void BasicX509Credential::initKeyInfo()
             is->setX509SerialNumber(ser);
             x509Data->getX509IssuerSerials().push_back(is);
         }
+*/
     }
     
     if (!m_xseccerts.empty()) {