Author: mcalmer
Date: Thu Jun 3 18:38:59 2010
New Revision: 2666
URL: http://svn.opensuse.org/viewcvs/limal?rev=2666&view=rev
Log:
blocxx::List => std::list
Modified:
limal-branches/mc-devel/limal-ca-mgm/Makefile.am
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp
limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp
limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.cpp
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h
limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/PathName.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/PathUtils.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ValueCheck.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityInfoAccessExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CA.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CAConfig.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLDistributionPointsExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificatePoliciesExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CommonData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/IssuerAlternativeNameExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectAlternativeNameExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CAConfig.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CRLTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
Modified: limal-branches/mc-devel/limal-ca-mgm/Makefile.am
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/Makefile.am?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/Makefile.am (original)
+++ limal-branches/mc-devel/limal-ca-mgm/Makefile.am Thu Jun 3 18:38:59 2010
@@ -42,7 +42,7 @@
maintainer-clean-local:
-rm -rf m4
-configure.in: configure.in.in $(srcdir)/VERSION
+configure.in: $(srcdir)/VERSION
$(MAKE) -f Makefile.cvs all
EXTRA_DIST = \
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp Thu Jun 3 18:38:59 2010
@@ -71,7 +71,7 @@
{
public:
AuthorityInfoAccessExtImpl()
- : info(blocxx::List<AuthorityInformation>())
+ : info(std::list<AuthorityInformation>())
{}
AuthorityInfoAccessExtImpl(const AuthorityInfoAccessExtImpl &aie)
@@ -86,7 +86,7 @@
return new AuthorityInfoAccessExtImpl(*this);
}
- blocxx::List<AuthorityInformation> info;
+ std::list<AuthorityInformation> info;
};
@@ -298,9 +298,9 @@
}
void
-AuthorityInfoAccessExt::setAuthorityInformation(const blocxx::List<AuthorityInformation>& infolist)
+AuthorityInfoAccessExt::setAuthorityInformation(const std::list<AuthorityInformation>& infolist)
{
- blocxx::List<AuthorityInformation>::const_iterator it = infolist.begin();
+ std::list<AuthorityInformation>::const_iterator it = infolist.begin();
for(;it != infolist.end(); it++) {
if(!(*it).valid()) {
LOGIT_ERROR("invalid AuthorityInformation in infolist");
@@ -312,7 +312,7 @@
m_impl->info = infolist;
}
-blocxx::List<AuthorityInformation>
+std::list<AuthorityInformation>
AuthorityInfoAccessExt::getAuthorityInformation() const
{
if(!isPresent()) {
@@ -347,7 +347,7 @@
if(isCritical()) extString += "critical,";
String val;
- blocxx::List<AuthorityInformation>::const_iterator it = m_impl->info.begin();
+ std::list<AuthorityInformation>::const_iterator it = m_impl->info.begin();
for(;it != m_impl->info.end(); ++it)
{
val = "";
@@ -378,7 +378,7 @@
LOGIT_DEBUG("return AuthorityInfoAccessExt::valid() is false");
return false;
}
- blocxx::List<AuthorityInformation>::const_iterator it = m_impl->info.begin();
+ std::list<AuthorityInformation>::const_iterator it = m_impl->info.begin();
for(;it != m_impl->info.end(); it++)
{
if(!(*it).valid())
@@ -402,7 +402,7 @@
{
result.append(String("No access informations available"));
}
- blocxx::List<AuthorityInformation>::const_iterator it = m_impl->info.begin();
+ std::list<AuthorityInformation>::const_iterator it = m_impl->info.begin();
for(;it != m_impl->info.end(); it++)
{
result.appendArray((*it).verify());
@@ -421,7 +421,7 @@
result.appendArray(ExtensionBase::dump());
if(!isPresent()) return result;
- blocxx::List< AuthorityInformation >::const_iterator it = m_impl->info.begin();
+ std::list< AuthorityInformation >::const_iterator it = m_impl->info.begin();
for(; it != m_impl->info.end(); ++it)
{
result.appendArray((*it).dump());
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp Thu Jun 3 18:38:59 2010
@@ -1360,10 +1360,10 @@
}
-blocxx::Listblocxx::String >
+std::listblocxx::String >
CA::getCATree(const String& repos)
{
- List ret;
+ std::list ret;
Array<String> caList = CA::getCAList(repos);
@@ -1599,10 +1599,10 @@
}
StringList::const_iterator it = policyKeys.begin();
- blocxx::List<RDNObject> l = dn.getDN();
+ std::list<RDNObject> l = dn.getDN();
bool policyFound = false;
- blocxx::List<RDNObject> caDNList = getCA().getSubjectDN().getDN();
+ std::list<RDNObject> caDNList = getCA().getSubjectDN().getDN();
for(; it != policyKeys.end(); ++it)
{
@@ -1625,7 +1625,7 @@
// we need a value
bool foundInDN = false;
- blocxx::List<RDNObject>::const_iterator rdnit = l.begin();
+ std::list<RDNObject>::const_iterator rdnit = l.begin();
for(; rdnit != l.end(); ++rdnit)
{
@@ -1718,7 +1718,7 @@
// read the CA and check the value
// *it == key (e.g. commonName, emailAddress, ...
- blocxx::List<RDNObject>::const_iterator rdnit = l.begin();
+ std::list<RDNObject>::const_iterator rdnit = l.begin();
RDNObject rdn2check = RDNObject_Priv(*it, "");
for(; rdnit != l.end(); ++rdnit)
@@ -1732,7 +1732,7 @@
bool validMatch = false;
- blocxx::List<RDNObject>::const_iterator caRdnIT = caDNList.begin();
+ std::list<RDNObject>::const_iterator caRdnIT = caDNList.begin();
for(; caRdnIT != caDNList.end(); ++caRdnIT)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp Thu Jun 3 18:38:59 2010
@@ -209,10 +209,10 @@
return false;
}
-blocxx::Listblocxx::String
+std::listblocxx::String
CAConfig::getKeylist(const String §ion) const
{
- blocxx::List<String> keylist;
+ std::list<String> keylist;
if (m_impl->parser.iniFile.contains(section) == SECTION)
{
@@ -224,11 +224,11 @@
void
CAConfig::copySection(const String &srcSection, const String &destSection)
{
- blocxx::List<String> keylist;
+ std::list<String> keylist;
keylist = getKeylist(srcSection);
- blocxx::List<String>::const_iterator it = keylist.begin();
+ std::list<String>::const_iterator it = keylist.begin();
for(; it != keylist.end(); ++it)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp Thu Jun 3 18:38:59 2010
@@ -37,7 +37,7 @@
{
public:
CRLDistributionPointsExtImpl()
- : altNameList(List<LiteralValue>())
+ : altNameList(std::list<LiteralValue>())
{}
CRLDistributionPointsExtImpl(const CRLDistributionPointsExtImpl& impl)
@@ -52,7 +52,7 @@
return new CRLDistributionPointsExtImpl(*this);
}
- blocxx::List<LiteralValue> altNameList;
+ std::list<LiteralValue> altNameList;
};
@@ -121,7 +121,7 @@
}
void
-CRLDistributionPointsExt::setCRLDistributionPoints(blocxx::List<LiteralValue> dp)
+CRLDistributionPointsExt::setCRLDistributionPoints(std::list<LiteralValue> dp)
{
StringArray r = checkLiteralValueList(dp);
if(!r.empty())
@@ -133,7 +133,7 @@
setPresent(true);
}
-blocxx::List<LiteralValue>
+std::list<LiteralValue>
CRLDistributionPointsExt::getCRLDistributionPoints() const
{
if(!isPresent())
@@ -171,7 +171,7 @@
if(isCritical()) extString += "critical,";
String val;
- blocxx::List<LiteralValue>::const_iterator it = m_impl->altNameList.begin();
+ std::list<LiteralValue>::const_iterator it = m_impl->altNameList.begin();
for(int j = 0;it != m_impl->altNameList.end(); ++it, ++j)
{
val = "";
@@ -236,7 +236,7 @@
result.appendArray(ExtensionBase::dump());
if(!isPresent()) return result;
- blocxx::List< LiteralValue >::const_iterator it = m_impl->altNameList.begin();
+ std::list< LiteralValue >::const_iterator it = m_impl->altNameList.begin();
for(; it != m_impl->altNameList.end(); ++it)
{
result.appendArray((*it).dump());
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp Thu Jun 3 18:38:59 2010
@@ -40,7 +40,7 @@
UserNoticeImpl()
: explicitText("")
, organization("")
- , noticeNumbers(blocxx::Listblocxx::Int32())
+ , noticeNumbers(std::listblocxx::Int32())
{}
UserNoticeImpl(const UserNoticeImpl& impl)
@@ -63,7 +63,7 @@
// (if included) must BOTH be present.
String organization; // max 200 characters
- blocxx::Listblocxx::Int32 noticeNumbers;
+ std::listblocxx::Int32 noticeNumbers;
};
@@ -74,13 +74,13 @@
CertificatePolicyImpl()
: policyIdentifier(String())
, cpsURI(StringList())
- , noticeList(blocxx::List<UserNotice>())
+ , noticeList(std::list<UserNotice>())
{}
CertificatePolicyImpl(const String &policyIdentifier)
: policyIdentifier(policyIdentifier)
, cpsURI(StringList())
- , noticeList(blocxx::List<UserNotice>())
+ , noticeList(std::list<UserNotice>())
{}
CertificatePolicyImpl(const CertificatePolicyImpl& impl)
@@ -100,7 +100,7 @@
String policyIdentifier; // required
StringList cpsURI; // Certification Practice Statement
- blocxx::List<UserNotice> noticeList;
+ std::list<UserNotice> noticeList;
};
class CertificatePoliciesExtImpl : public blocxx::COWIntrusiveCountableBase
@@ -108,10 +108,10 @@
public:
CertificatePoliciesExtImpl()
: ia5org(false),
- policies(blocxx::List<CertificatePolicy>())
+ policies(std::list<CertificatePolicy>())
{}
- CertificatePoliciesExtImpl(const blocxx::List<CertificatePolicy>& policies)
+ CertificatePoliciesExtImpl(const std::list<CertificatePolicy>& policies)
: ia5org(false),
policies(policies)
{}
@@ -130,7 +130,7 @@
}
bool ia5org;
- blocxx::List<CertificatePolicy> policies;
+ std::list<CertificatePolicy> policies;
};
@@ -225,7 +225,7 @@
void
UserNotice::setOrganizationNotice(const String& org,
- const blocxx::Listblocxx::Int32& numbers)
+ const std::listblocxx::Int32& numbers)
{
m_impl->organization = org;
m_impl->noticeNumbers = numbers;
@@ -237,7 +237,7 @@
return m_impl->organization;
}
-blocxx::Listblocxx::Int32
+std::listblocxx::Int32
UserNotice::getNoticeNumbers() const
{
return m_impl->noticeNumbers;
@@ -275,7 +275,7 @@
ca.getConfig()->setValue(sectionName, "organization", m_impl->organization);
String numbers;
- blocxx::Listblocxx::Int32::const_iterator it = m_impl->noticeNumbers.begin();
+ std::listblocxx::Int32::const_iterator it = m_impl->noticeNumbers.begin();
for(;it != m_impl->noticeNumbers.end(); ++it)
{
numbers += String(*it)+",";
@@ -333,7 +333,7 @@
result.append("organization = " + m_impl->organization);
String n;
- blocxx::List< blocxx::Int32 >::const_iterator it = m_impl->noticeNumbers.begin();
+ std::list< blocxx::Int32 >::const_iterator it = m_impl->noticeNumbers.begin();
for(; it != m_impl->noticeNumbers.end(); ++it)
{
n += String(*it) + " ";
@@ -485,7 +485,7 @@
}
void
-CertificatePolicy::setUserNoticeList(const blocxx::List<UserNotice>& list)
+CertificatePolicy::setUserNoticeList(const std::list<UserNotice>& list)
{
StringArray r = checkNoticeList(list);
if(!r.empty())
@@ -496,7 +496,7 @@
m_impl->noticeList = list;
}
-blocxx::List<UserNotice>
+std::list<UserNotice>
CertificatePolicy::getUserNoticeList() const
{
return m_impl->noticeList;
@@ -536,7 +536,7 @@
ca.getConfig()->setValue(sectionName, "CPS."+String(i),(*it));
}
- blocxx::List<UserNotice>::const_iterator nit = m_impl->noticeList.begin();
+ std::list<UserNotice>::const_iterator nit = m_impl->noticeList.begin();
for(blocxx::UInt32 j = 1;nit != m_impl->noticeList.end(); ++nit, ++j)
{
String n = (*nit).commit2Config(ca, type, j);
@@ -608,7 +608,7 @@
result.append("CPS = " + (*it1));
}
- blocxx::List< UserNotice >::const_iterator it2 = m_impl->noticeList.begin();
+ std::list< UserNotice >::const_iterator it2 = m_impl->noticeList.begin();
for(; it2 != m_impl->noticeList.end(); ++it2)
{
result.appendArray((*it2).dump());
@@ -666,10 +666,10 @@
}
blocxx::StringArray
-CertificatePolicy::checkNoticeList(const blocxx::List<UserNotice>& list) const
+CertificatePolicy::checkNoticeList(const std::list<UserNotice>& list) const
{
StringArray result;
- blocxx::List<UserNotice>::const_iterator it = list.begin();
+ std::list<UserNotice>::const_iterator it = list.begin();
for(;it != list.end(); it++)
{
result.appendArray((*it).verify());
@@ -685,7 +685,7 @@
, m_impl(new CertificatePoliciesExtImpl())
{}
-CertificatePoliciesExt::CertificatePoliciesExt(const blocxx::List<CertificatePolicy>& policies)
+CertificatePoliciesExt::CertificatePoliciesExt(const std::list<CertificatePolicy>& policies)
: ExtensionBase()
, m_impl(new CertificatePoliciesExtImpl(policies))
{
@@ -784,7 +784,7 @@
}
void
-CertificatePoliciesExt::setPolicies(const blocxx::List<CertificatePolicy>& policies)
+CertificatePoliciesExt::setPolicies(const std::list<CertificatePolicy>& policies)
{
StringArray r = checkPolicies(policies);
if(!r.empty())
@@ -797,7 +797,7 @@
setPresent(true);
}
-blocxx::List<CertificatePolicy>
+std::list<CertificatePolicy>
CertificatePoliciesExt::getPolicies() const
{
if(!isPresent())
@@ -836,7 +836,7 @@
if(m_impl->ia5org) extString += "ia5org,";
- blocxx::List<CertificatePolicy>::const_iterator it = m_impl->policies.begin();
+ std::list<CertificatePolicy>::const_iterator it = m_impl->policies.begin();
for(blocxx::UInt32 i = 0;it != m_impl->policies.end(); ++it, ++i)
{
extString += (*it).commit2Config(ca, type, i) + ",";
@@ -898,7 +898,7 @@
if(!isPresent()) return result;
result.append("ia5org = " + blocxx::Bool(m_impl->ia5org).toString());
- blocxx::List< CertificatePolicy >::const_iterator it = m_impl->policies.begin();
+ std::list< CertificatePolicy >::const_iterator it = m_impl->policies.begin();
for(; it != m_impl->policies.end(); ++it)
{
result.appendArray((*it).dump());
@@ -909,10 +909,10 @@
blocxx::StringArray
-CertificatePoliciesExt::checkPolicies(const blocxx::List<CertificatePolicy>& pl) const
+CertificatePoliciesExt::checkPolicies(const std::list<CertificatePolicy>& pl) const
{
StringArray result;
- blocxx::List<CertificatePolicy>::const_iterator it = pl.begin();
+ std::list<CertificatePolicy>::const_iterator it = pl.begin();
for(;it != pl.end(); it++)
{
result.appendArray((*it).verify());
Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp Thu Jun 3 18:38:59 2010
@@ -357,7 +357,7 @@
}
}
-DNObject::DNObject(const blocxx::List<RDNObject> &dn)
+DNObject::DNObject(const std::list<RDNObject> &dn)
: m_impl(new DNObjectImpl())
{
m_impl->dn = dn;
@@ -386,7 +386,7 @@
}
void
-DNObject::setDN(const blocxx::List<RDNObject> &dn)
+DNObject::setDN(const std::list<RDNObject> &dn)
{
StringArray r = checkRDNList(dn);
if(!r.empty())
@@ -397,7 +397,7 @@
m_impl->dn = dn;
}
-blocxx::List<RDNObject>
+std::list<RDNObject>
DNObject::getDN() const
{
return m_impl->dn;
@@ -408,7 +408,7 @@
{
String ret;
- blocxx::List<RDNObject>::const_iterator it = m_impl->dn.begin();
+ std::list<RDNObject>::const_iterator it = m_impl->dn.begin();
for(; it != m_impl->dn.end(); ++it)
{
if(! (*it).getOpenSSLValue().empty())
@@ -454,11 +454,11 @@
}
blocxx::StringArray
-DNObject::checkRDNList(const blocxx::List<RDNObject>& list) const
+DNObject::checkRDNList(const std::list<RDNObject>& list) const
{
StringArray result;
- blocxx::List<RDNObject>::const_iterator it = list.begin();
+ std::list<RDNObject>::const_iterator it = list.begin();
for(; it != list.end(); ++it)
{
result.appendArray((*it).verify());
@@ -472,7 +472,7 @@
StringArray result;
result.append("DNObject::dump()");
- blocxx::List< RDNObject >::const_iterator it = m_impl->dn.begin();
+ std::list< RDNObject >::const_iterator it = m_impl->dn.begin();
for(; it != m_impl->dn.end(); ++it)
{
result.appendArray((*it).dump());
Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp Thu Jun 3 18:38:59 2010
@@ -69,7 +69,7 @@
{
public:
DNObjectImpl()
- : dn(blocxx::List<RDNObject>())
+ : dn(std::list<RDNObject>())
{}
DNObjectImpl(const DNObjectImpl& impl)
@@ -84,7 +84,7 @@
return new DNObjectImpl(*this);
}
- blocxx::List<RDNObject> dn;
+ std::list<RDNObject> dn;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp Thu Jun 3 18:38:59 2010
@@ -116,7 +116,7 @@
}
- List<RDNObject>::iterator it = dn.begin();
+ std::list<RDNObject>::iterator it = dn.begin();
bool found = false;
for(; it != dn.end(); ++it) {
@@ -141,7 +141,7 @@
/* and this is the other option */
- List<RDNObject> tmpDN;
+ std::list<RDNObject> tmpDN;
for(uint j = 0 ; j < lines.size(); ++j)
{
@@ -230,7 +230,7 @@
lastFieldName.startsWith("emailAddress", String::E_CASE_INSENSITIVE)))
{
// do we have a default for lastFiledName?
- blocxx::List<RDNObject>::const_iterator rdnIT;
+ std::list<RDNObject>::const_iterator rdnIT;
for(rdnIT = m_impl->dn.begin(); rdnIT != m_impl->dn.end(); ++rdnIT)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.cpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.cpp Thu Jun 3 18:38:59 2010
@@ -223,33 +223,38 @@
if (m_parser)
{
m_parser->inifile.Dir (path, stringList);
- if (stringList.find(key) != stringList.end())
- {
- ret = VALUE;
- }
+ StringList::const_iterator it;
+ for(it = stringList.begin(); it != stringList.end(); ++it)
+ {
+ if( key == *it)
+ ret = VALUE;
+ }
path.clear();
stringList.clear();
path.append("section");
path.appendArray (m_path);
m_parser->inifile.Dir (path, stringList);
- if (stringList.find(key) != stringList.end())
- {
- if (ret == VALUE)
- {
- ret = VALUEandSECTION;
- }
- else
- {
- ret = SECTION;
- }
- }
+ for(it = stringList.begin(); it != stringList.end(); ++it)
+ {
+ if( key == *it)
+ {
+ if (ret == VALUE)
+ {
+ ret = VALUEandSECTION;
+ }
+ else
+ {
+ ret = SECTION;
+ }
+ }
+ }
}
return ret;
}
// -------------------------------------------------------------------
-blocxx::Listblocxx::String Section::getEntryKeys() const
+std::listblocxx::String Section::getEntryKeys() const
{
StringList entryKeys;
StringList stringList;
@@ -483,7 +488,7 @@
}
// -------------------------------------------------------------------
-blocxx::Listblocxx::String Section::getSectionKeys() const
+std::listblocxx::String Section::getSectionKeys() const
{
StringList sectionList;
StringList stringList;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp Thu Jun 3 18:38:59 2010
@@ -183,9 +183,9 @@
/**
* Get all entry keys of a section in the order like they
* have been written to file.
- * @return blocxx::Listblocxx::String
+ * @return std::listblocxx::String
*/
- blocxx::Listblocxx::String getEntryKeys() const;
+ std::listblocxx::String getEntryKeys() const;
/**
@@ -277,9 +277,9 @@
/**
* Get all section keys of a section in the order like they
* have been written to file.
- * @return blocxx::Listblocxx::String
+ * @return std::listblocxx::String
*/
- blocxx::Listblocxx::String getSectionKeys() const;
+ std::listblocxx::String getSectionKeys() const;
/**
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h Thu Jun 3 18:38:59 2010
@@ -15,13 +15,12 @@
#define IniFile_h
#include
-#include
#include
#include
#include
#include
#include "INIParser/INIParserDescr.hpp"
-
+#include <list>
#include <map>
#define INIPARSER "IniParser"
@@ -36,7 +35,7 @@
*/
struct SectionAll;
-typedef blocxx::List<SectionAll> SectionList;
+typedef std::list<SectionAll> SectionList;
struct SectionAll
{
@@ -49,7 +48,7 @@
SectionList sectionList;
};
-typedef blocxx::Listblocxx::String StringList;
+typedef std::listblocxx::String StringList;
typedef blocxx::Map StringMap;
/**
@@ -202,7 +201,7 @@
//enum IniType { VALUE, SECTION,};
struct IniContainerElement;
-typedef blocxx::List<IniContainerElement> IniContainer;
+typedef std::list<IniContainerElement> IniContainer;
typedef IniContainer::iterator IniIterator;
/** indices */
Modified: limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp Thu Jun 3 18:38:59 2010
@@ -38,11 +38,11 @@
public:
IssuerAlternativeNameExtImpl()
: issuerCopy(false)
- , altNameList(blocxx::List<LiteralValue>())
+ , altNameList(std::list<LiteralValue>())
{}
IssuerAlternativeNameExtImpl(bool copyIssuer,
- const blocxx::List<LiteralValue> &alternativeNameList)
+ const std::list<LiteralValue> &alternativeNameList)
: issuerCopy(copyIssuer)
, altNameList(alternativeNameList)
{}
@@ -61,7 +61,7 @@
}
bool issuerCopy;
- blocxx::List<LiteralValue> altNameList;
+ std::list<LiteralValue> altNameList;
};
@@ -71,7 +71,7 @@
{}
IssuerAlternativeNameExt::IssuerAlternativeNameExt(bool copyIssuer,
- const blocxx::List<LiteralValue> &alternativeNameList)
+ const std::list<LiteralValue> &alternativeNameList)
: ExtensionBase()
, m_impl(new IssuerAlternativeNameExtImpl(copyIssuer, alternativeNameList))
{
@@ -167,7 +167,7 @@
}
void
-IssuerAlternativeNameExt::setAlternativeNameList(const blocxx::List<LiteralValue> &alternativeNameList)
+IssuerAlternativeNameExt::setAlternativeNameList(const std::list<LiteralValue> &alternativeNameList)
{
StringArray r = checkLiteralValueList(alternativeNameList);
if(!r.empty())
@@ -179,7 +179,7 @@
setPresent(true);
}
-blocxx::List<LiteralValue>
+std::list<LiteralValue>
IssuerAlternativeNameExt::getAlternativeNameList() const
{
if(!isPresent())
@@ -231,7 +231,7 @@
if(m_impl->issuerCopy) extString += "issuer:copy,";
String val;
- blocxx::List<LiteralValue>::const_iterator it = m_impl->altNameList.begin();
+ std::list<LiteralValue>::const_iterator it = m_impl->altNameList.begin();
for(int j = 0;it != m_impl->altNameList.end(); ++it, ++j)
{
val = "";
@@ -303,7 +303,7 @@
result.append("Issuer:copy = " + Bool(m_impl->issuerCopy).toString());
- blocxx::List< LiteralValue >::const_iterator it = m_impl->altNameList.begin();
+ std::list< LiteralValue >::const_iterator it = m_impl->altNameList.begin();
for(; it != m_impl->altNameList.end(); ++it)
{
result.appendArray((*it).dump());
Modified: limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp?rev=2666&r1=2665&r2=2666&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp Thu Jun 3 18:38:59 2010
@@ -212,8 +212,8 @@
blocxx::String errOutput;
int status = -1;
- blocxx::List<RDNObject> dnList = dn.getDN();
- blocxx::List<RDNObject>::const_iterator it;
+ std::list<RDNObject> dnList = dn.getDN();
+ std::list<RDNObject>::const_iterator it;
for(it = dnList.begin(); it != dnList.end(); ++it)
{
@@ -1857,7 +1857,7 @@
blocxx::Arrayblocxx::String
OpenSSLUtils::listCA(const String &repository)
{
- List<String> tmpList;
+ std::list<String> tmpList;
Array<String> retList;
int r = path::readDir(tmpList, repository, false);
@@ -1873,7 +1873,7 @@
tmpList.sort();
- List<String>::const_iterator cont;
+ std::list<String>::const_iterator cont;
path::PathInfo pi(repository);
@@ -2056,7 +2056,7 @@
const String &repository)
{
Array