Author: mcalmer
Date: Sat Jun 12 14:33:19 2010
New Revision: 2669
URL: http://svn.opensuse.org/viewcvs/limal?rev=2669&view=rev
Log:
blocxx:Array => std::vector
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.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/CRLData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.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/DNObject_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp
limal-branches/mc-devel/limal-ca-mgm/src/ExtensionBase.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.cpp
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.cpp
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h
limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp
limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.hpp
limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp
limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp
limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.hpp
limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/RequestData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp
limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp
limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.hpp
limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/Logger.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/Url.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlUtils.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/AuthorityKeyIdentifierExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BasicConstraintsExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.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/CRLData.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/CRLGenerationData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLReason.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateIssueData.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/DNObject.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtendedKeyUsageExt.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtensionBase.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/LiteralValues.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestGenerationData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/StringExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectAlternativeNameExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectKeyIdentifierExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLGenerationExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateIssueExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3RequestExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA1.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.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/ConvertTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.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
limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc
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=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp Sat Jun 12 14:33:19 2010
@@ -177,29 +177,29 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
AuthorityInformation::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(!initAccessOIDCheck().isValid(m_impl->accessOID))
{
- result.append(Format("invalid value(%1) for accessOID", m_impl->accessOID).toString());
+ result.push_back(Format("invalid value(%1) for accessOID", m_impl->accessOID).toString());
}
- result.appendArray(m_impl->location.verify());
+ appendArray(result, m_impl->location.verify());
LOGIT_DEBUG_STRINGARRAY("AuthorityInformation::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
AuthorityInformation::dump() const
{
- StringArray result;
- result.append("AuthorityInformation::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("AuthorityInformation::dump()");
- result.append("accessOID = " + getAccessOID());
- result.appendArray(getLocation().dump());
+ result.push_back("accessOID = " + getAccessOID());
+ appendArray(result, getLocation().dump());
return result;
}
@@ -260,15 +260,17 @@
bool p = caConfig->exists(type2Section(type, true), "authorityInfoAccess");
if(p)
{
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "authorityInfoAccess"));
+ std::vectorblocxx::String sp = convStringArray(
+ PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "authorityInfoAccess"))
+ );
if(sp[0].equalsIgnoreCase("critical")) setCritical(true);
- StringArray::const_iterator it = sp.begin();
+ std::vectorblocxx::String::const_iterator it = sp.begin();
for(; it != sp.end(); ++it)
{
- StringArray al = PerlRegEx(";").split(*it);
+ std::vectorblocxx::String al = convStringArray(PerlRegEx(";").split(*it));
try
{
@@ -391,40 +393,40 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
AuthorityInfoAccessExt::verify() const
{
- blocxx::StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(m_impl->info.empty())
{
- result.append(String("No access informations available"));
+ result.push_back(String("No access informations available"));
}
std::list<AuthorityInformation>::const_iterator it = m_impl->info.begin();
for(;it != m_impl->info.end(); it++)
{
- result.appendArray((*it).verify());
+ appendArray(result, (*it).verify());
}
LOGIT_DEBUG_STRINGARRAY("AuthorityInfoAccessExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
AuthorityInfoAccessExt::dump() const
{
- StringArray result;
- result.append("AuthorityInfoAccessExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("AuthorityInfoAccessExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
std::list< AuthorityInformation >::const_iterator it = m_impl->info.begin();
for(; it != m_impl->info.end(); ++it)
{
- result.appendArray((*it).dump());
+ appendArray(result, (*it).dump());
}
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp Sat Jun 12 14:33:19 2010
@@ -125,24 +125,24 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
AuthorityKeyIdentifierExt::verify() const
{
- return blocxx::StringArray();
+ return std::vectorblocxx::String();
}
-blocxx::StringArray
+std::vectorblocxx::String
AuthorityKeyIdentifierExt::dump() const
{
- StringArray result;
- result.append("AuthorityKeyIdentifierExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("AuthorityKeyIdentifierExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("KeyID = " + getKeyID());
- result.append("DirName = " + getDirName());
- result.append("serial = " + getSerial());
+ result.push_back("KeyID = " + getKeyID());
+ result.push_back("DirName = " + getDirName());
+ result.push_back("serial = " + getSerial());
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp Sat Jun 12 14:33:19 2010
@@ -87,15 +87,15 @@
bool p = caConfig->exists(type2Section(type, true), "authorityKeyIdentifier");
if(p)
{
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "authorityKeyIdentifier"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "authorityKeyIdentifier")));
if(sp[0].equalsIgnoreCase("critical"))
{
setCritical(true);
- sp.remove(0);
+ sp.erase(sp.begin());
}
- StringArray::const_iterator it = sp.begin();
+ std::vectorblocxx::String::const_iterator it = sp.begin();
for(; it != sp.end(); ++it)
{
if((*it).equalsIgnoreCase("keyid")) m_impl->keyid = KeyID_normal;
@@ -247,32 +247,32 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
AuthorityKeyIdentifierGenerateExt::verify() const
{
- blocxx::StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(getKeyID() == KeyID_none && getIssuer() == Issuer_none)
{
- result.append(String("Invalid value for keyid and issuer. ") +
+ result.push_back(String("Invalid value for keyid and issuer. ") +
String("At least one of both must be set"));
}
LOGIT_DEBUG_STRINGARRAY("AuthorityKeyIdentifierGenerateExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
AuthorityKeyIdentifierGenerateExt::dump() const
{
- StringArray result;
- result.append("AuthorityKeyIdentifierGenerateExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("AuthorityKeyIdentifierGenerateExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("KeyID = " + String(getKeyID()));
- result.append("Issuer = " + String(getIssuer()));
+ result.push_back("KeyID = " + String(getKeyID()));
+ result.push_back("Issuer = " + String(getIssuer()));
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp Sat Jun 12 14:33:19 2010
@@ -88,18 +88,18 @@
bool isCA = false;
blocxx::Int32 pl = -1;
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "basicConstraints"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "basicConstraints")));
if(sp[0].equalsIgnoreCase("critical")) setCritical(true);
- StringArray::const_iterator it = sp.begin();
+ std::vectorblocxx::String::const_iterator it = sp.begin();
for(; it != sp.end(); ++it)
{
if((*it).equalsIgnoreCase("ca:true")) isCA = true;
else if((*it).equalsIgnoreCase("ca:false")) isCA = false;
else if((*it).startsWith("pathlen:", String::E_CASE_INSENSITIVE))
{
- StringArray plA = PerlRegEx(":").split(*it);
+ std::vectorblocxx::String plA = convStringArray(PerlRegEx(":").split(*it));
pl = plA[1].toInt32();
}
}
@@ -234,38 +234,38 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
BasicConstraintsExt::verify() const
{
- blocxx::StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(isCA() && getPathLength() < -1)
{
- result.append(Format("invalid value for pathLength(%1). Has to be >= -1",
+ result.push_back(Format("invalid value for pathLength(%1). Has to be >= -1",
getPathLength()).toString());
}
if(!isCA() && getPathLength() != -1)
{
- result.append(Format("invalid value for pathLength(%1). Has to be -1",
+ result.push_back(Format("invalid value for pathLength(%1). Has to be -1",
getPathLength()).toString());
}
LOGIT_DEBUG_STRINGARRAY("BasicConstraintsExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
BasicConstraintsExt::dump() const
{
- StringArray result;
- result.append("BasicConstraintsExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("BasicConstraintsExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("CA = " + Bool(isCA()).toString());
- result.append("pathlen = " + String(getPathLength()));
+ result.push_back("CA = " + Bool(isCA()).toString());
+ result.push_back("pathlen = " + String(getPathLength()));
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp Sat Jun 12 14:33:19 2010
@@ -138,11 +138,11 @@
blocxx::UInt32 keyUsage = 0;
String ku = caConfig->getValue(type2Section(type, true), "keyUsage");
- StringArray sp = PerlRegEx("\\s*,\\s*").split(ku);
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*").split(ku));
if(sp[0].equalsIgnoreCase("critical")) setCritical(true);
- StringArray::const_iterator it = sp.begin();
+ std::vectorblocxx::String::const_iterator it = sp.begin();
for(; it != sp.end(); ++it)
{
if((*it).equalsIgnoreCase("digitalSignature")) keyUsage |= digitalSignature;
@@ -307,34 +307,34 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
KeyUsageExt::verify() const
{
- blocxx::StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(!validKeyUsage(getValue()))
{
- result.append(Format("invalid value '%1' for keyUsage", getValue()).toString());
+ result.push_back(Format("invalid value '%1' for keyUsage", getValue()).toString());
}
LOGIT_DEBUG_STRINGARRAY("KeyUsageExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
KeyUsageExt::dump() const
{
- StringArray result;
- result.append("KeyUsageExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("KeyUsageExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
String ku;
ku.format("%04x", getValue());
- result.append("KeyUsage = 0x" + ku);
+ result.push_back("KeyUsage = 0x" + ku);
return result;
}
@@ -378,11 +378,11 @@
blocxx::UInt32 bits = 0;
String ct = caConfig->getValue(type2Section(type, true), "nsCertType");
- StringArray sp = PerlRegEx("\\s*,\\s*").split(ct);
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*").split(ct));
if(sp[0].equalsIgnoreCase("critical")) setCritical(true);
- StringArray::const_iterator it = sp.begin();
+ std::vectorblocxx::String::const_iterator it = sp.begin();
for(; it != sp.end(); ++it)
{
if((*it).equalsIgnoreCase("client")) bits |= client;
@@ -538,33 +538,33 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
NsCertTypeExt::verify() const
{
- blocxx::StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(getValue() > 0xFF || getValue() == 0)
{
- result.append(Format("invalid value '%1' for nsCertType", getValue()).toString());
+ result.push_back(Format("invalid value '%1' for nsCertType", getValue()).toString());
}
LOGIT_DEBUG_STRINGARRAY("NsCertTypeExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
NsCertTypeExt::dump() const
{
- StringArray result;
- result.append("NsCertTypeExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("NsCertTypeExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
String nsct;
nsct.format("%02x", getValue());
- result.append("NsCertType = 0x" + nsct);
+ result.push_back("NsCertType = 0x" + nsct);
return result;
}
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=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp Sat Jun 12 14:33:19 2010
@@ -120,8 +120,8 @@
class CATreeCompare
{
public:
- int operator()(const blocxx::Arrayblocxx::String &l,
- const blocxx::Arrayblocxx::String r) const
+ int operator()(const std::vectorblocxx::String &l,
+ const std::vectorblocxx::String r) const
{
if(l.back() == "" && r.back() != "")
{
@@ -661,22 +661,22 @@
commitConfig2Template();
}
-blocxx::Array >
+std::vector >
CA::getCertificateList()
{
updateDB();
- Array< std::map > ret;
+ std::vector< std::map > ret;
ret = OpenSSLUtils::listCertificates(m_impl->caName, m_impl->repositoryDir);
return ret;
}
-blocxx::Array >
+std::vector >
CA::getRequestList()
{
- Array< std::map > ret;
+ std::vector< std::map > ret;
ret = OpenSSLUtils::listRequests(m_impl->caName, m_impl->repositoryDir);
@@ -1349,10 +1349,10 @@
}
-blocxx::Arrayblocxx::String
+std::vectorblocxx::String
CA::getCAList(const String& repos)
{
- Array<String> caList;
+ std::vector<String> caList;
caList = OpenSSLUtils::listCA(repos);
@@ -1360,42 +1360,42 @@
}
-std::listblocxx::String >
+std::listblocxx::String >
CA::getCATree(const String& repos)
{
- std::list ret;
+ std::list ret;
- Array<String> caList = CA::getCAList(repos);
+ std::vector<String> caList = CA::getCAList(repos);
if(caList.empty())
{
return ret;
}
- std::map caHash;
+ std::map caHash;
- Array<String>::const_iterator it = caList.begin();
+ std::vector<String>::const_iterator it = caList.begin();
for(; it != caList.end(); ++it)
{
CertificateData caData =
LocalManagement::getCertificate(repos + "/" + (*it) + "/cacert.pem",
E_PEM);
- Array<String> d;
+ std::vector<String> d;
d.push_back(caData.getSubjectDN().getOpenSSLString());
d.push_back(caData.getIssuerDN().getOpenSSLString());
caHash[*it] = d;
}
- std::map::const_iterator chit = caHash.begin();
+ std::map::const_iterator chit = caHash.begin();
for(; chit != caHash.end(); ++chit)
{
// subject == issuer
if( ((*chit).second)[0] == ((*chit).second)[1] )
{
// root CA
- Array<String> d;
+ std::vector<String> d;
d.push_back((*chit).first);
d.push_back("");
@@ -1406,13 +1406,13 @@
bool issuerFound = false;
// sub CA; find caName of the issuer
- std::map::const_iterator chitnew = caHash.begin();
+ std::map::const_iterator chitnew = caHash.begin();
for(; chitnew != caHash.end(); ++chitnew)
{
// issuer == subject
if( ((*chit).second)[1] == ((*chitnew).second)[0] )
{
- Array<String> d;
+ std::vector<String> d;
d.push_back((*chit).first);
d.push_back((*chitnew).first);
@@ -1425,7 +1425,7 @@
if(!issuerFound)
{
// the issuer is not in our repository
- Array<String> d;
+ std::vector<String> d;
d.push_back((*chit).first);
d.push_back("");
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=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp Sat Jun 12 14:33:19 2010
@@ -76,35 +76,35 @@
CAConfig::CAConfig(const String &file)
: m_impl(new CAConfigImpl(file))
{
- blocxx::Array<Options> options;
- blocxx::StringArray commentsDescr;
- blocxx::Array<SectionDescr> sectionDescr;
- blocxx::Array<EntryDescr> entryDescr;
- blocxx::Array<IoPatternDescr> rewrites;
-
- options.append (NO_NESTED_SECTIONS);
- options.append (LINE_CAN_CONTINUE);
-
- commentsDescr.append ("^[ \t]*#.*$");
- commentsDescr.append ("#.*");
- commentsDescr.append ("^[ \t]*$");
- commentsDescr.append ("^[ \t]*;[^;]+.*$");
+ std::vector<Options> options;
+ std::vectorblocxx::String commentsDescr;
+ std::vector<SectionDescr> sectionDescr;
+ std::vector<EntryDescr> entryDescr;
+ std::vector<IoPatternDescr> rewrites;
+
+ options.push_back (NO_NESTED_SECTIONS);
+ options.push_back (LINE_CAN_CONTINUE);
+
+ commentsDescr.push_back ("^[ \t]*#.*$");
+ commentsDescr.push_back ("#.*");
+ commentsDescr.push_back ("^[ \t]*$");
+ commentsDescr.push_back ("^[ \t]*;[^;]+.*$");
IoPatternDescr pattern1 = { "^[ \t]*([^=;]*[^ \t;=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , " %s = %s"};
EntryDescr eDescr1 = {pattern1, "", "" , false};
- entryDescr.append (eDescr1);
+ entryDescr.push_back (eDescr1);
IoPatternDescr pattern2 = {"^[ \t]*;;[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , ";; %s = %s"};
EntryDescr eDescr2 = {pattern2, "", "" , false};
- entryDescr.append (eDescr2);
+ entryDescr.push_back (eDescr2);
IoPatternDescr patternBegin1 = {"^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]"};
IoPatternDescr patternBegin2 = {"^[ \t]*;;[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", ";; [%s]"};
IoPatternDescr patternEnd;
SectionDescr sDescr1 = {patternBegin1, patternEnd , false };
- sectionDescr.append (sDescr1);
+ sectionDescr.push_back (sDescr1);
SectionDescr sDescr2 = {patternBegin2, patternEnd , false };
- sectionDescr.append (sDescr2);
+ sectionDescr.push_back (sDescr2);
m_impl->parser.initMachine (options, commentsDescr, sectionDescr, entryDescr, rewrites);
m_impl->parser.initFiles (file);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp Sat Jun 12 14:33:19 2010
@@ -88,31 +88,31 @@
return m_impl->revocationReason.valid();
}
-blocxx::StringArray
+std::vectorblocxx::String
RevocationEntry::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(!initHexCheck().isValid(m_impl->serial))
{
- result.append(Format("invalid serial: %1", m_impl->serial).toString());
+ result.push_back(Format("invalid serial: %1", m_impl->serial).toString());
}
- result.appendArray(m_impl->revocationReason.verify());
+ appendArray(result, m_impl->revocationReason.verify());
LOGIT_DEBUG_STRINGARRAY("RevocationEntry::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
RevocationEntry::dump() const
{
- StringArray result;
- result.append("RevocationEntry::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("RevocationEntry::dump()");
- result.append("Serial = " + m_impl->serial);
- result.append("revocation Date = " + String(m_impl->revocationDate));
- result.appendArray(m_impl->revocationReason.dump());
+ result.push_back("Serial = " + m_impl->serial);
+ result.push_back("revocation Date = " + String(m_impl->revocationDate));
+ appendArray(result, m_impl->revocationReason.dump());
return result;
}
@@ -275,7 +275,7 @@
if(!m_impl->extensions.valid()) return false;
- StringArray r = checkRevocationData(m_impl->revocationData);
+ std::vectorblocxx::String r = checkRevocationData(m_impl->revocationData);
if(!r.empty())
{
LOGIT_DEBUG(r[0]);
@@ -284,45 +284,45 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
CRLData::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(m_impl->version < 1 || m_impl->version > 2)
{
- result.append(Format("invalid version: %1", m_impl->version).toString());
+ result.push_back(Format("invalid version: %1", m_impl->version).toString());
}
if(m_impl->lastUpdate == 0)
{
- result.append(Format("invalid lastUpdate: %1", m_impl->lastUpdate).toString());
+ result.push_back(Format("invalid lastUpdate: %1", m_impl->lastUpdate).toString());
}
if(m_impl->nextUpdate <= m_impl->lastUpdate)
{
- result.append(Format("invalid nextUpdate: %1", m_impl->nextUpdate).toString());
+ result.push_back(Format("invalid nextUpdate: %1", m_impl->nextUpdate).toString());
}
- result.appendArray(m_impl->issuer.verify());
+ appendArray(result, m_impl->issuer.verify());
- result.appendArray(m_impl->extensions.verify());
- result.appendArray(checkRevocationData(m_impl->revocationData));
+ appendArray(result, m_impl->extensions.verify());
+ appendArray(result, checkRevocationData(m_impl->revocationData));
LOGIT_DEBUG_STRINGARRAY("CRLData::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
CRLData::dump() const
{
- StringArray result;
- result.append("CRLData::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("CRLData::dump()");
- result.append("Version = " + String(m_impl->version));
- result.append("Fingerprint = " + m_impl->fingerprint);
- result.append("last Update = " + String(m_impl->lastUpdate));
- result.append("next Update = " + String(m_impl->nextUpdate));
- result.appendArray(m_impl->issuer.dump());
- result.append("signatureAlgorithm = "+ String(m_impl->signatureAlgorithm));
+ result.push_back("Version = " + String(m_impl->version));
+ result.push_back("Fingerprint = " + m_impl->fingerprint);
+ result.push_back("last Update = " + String(m_impl->lastUpdate));
+ result.push_back("next Update = " + String(m_impl->nextUpdate));
+ appendArray(result, m_impl->issuer.dump());
+ result.push_back("signatureAlgorithm = "+ String(m_impl->signatureAlgorithm));
String s;
for(uint i = 0; i < m_impl->signature.size(); ++i)
@@ -331,15 +331,15 @@
d.format("%02x:", static_cast<UInt8>(m_impl->signature[i]));
s += d;
}
- result.append("Signature = " + s);
+ result.push_back("Signature = " + s);
- result.appendArray(m_impl->extensions.dump());
+ appendArray(result, m_impl->extensions.dump());
std::map< String, RevocationEntry >::const_iterator it = m_impl->revocationData.begin();
for(; it != m_impl->revocationData.end(); ++it)
{
- result.append((*it).first);
- result.appendArray(((*it).second).dump());
+ result.push_back((*it).first);
+ appendArray(result, ((*it).second).dump());
}
return result;
@@ -350,14 +350,14 @@
: m_impl(new CRLDataImpl())
{}
-StringArray
+std::vectorblocxx::String
CRLData::checkRevocationData(const std::map& rd) const
{
- StringArray result;
+ std::vectorblocxx::String result;
std::map::const_iterator it = rd.begin();
for(; it != rd.end(); ++it)
{
- result.appendArray(((*it).second).verify());
+ appendArray(result, ((*it).second).verify());
}
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp Sat Jun 12 14:33:19 2010
@@ -80,7 +80,7 @@
LOGIT_DEBUG("Revocation Date: " << sbuf);
PerlRegEx r("^(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)Z$");
- StringArray sa = r.capture(sbuf);
+ std::vectorblocxx::String sa = convStringArray(r.capture(sbuf));
if(sa.size() != 7)
{
@@ -121,7 +121,7 @@
BLOCXX_THROW(ca_mgm::ValueException,
Format(__("Invalid serial %1."), serial).c_str());
}
- StringArray r = reason.verify();
+ std::vectorblocxx::String r = reason.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -233,7 +233,7 @@
void
CRLData_Priv::setIssuerDN(const DNObject& issuer)
{
- StringArray r = issuer.verify();
+ std::vectorblocxx::String r = issuer.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -257,7 +257,7 @@
void
CRLData_Priv::setExtensions(const X509v3CRLExts& ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -269,7 +269,7 @@
void
CRLData_Priv::setRevocationData(const std::map& data)
{
- StringArray r = checkRevocationData(data);
+ std::vectorblocxx::String r = checkRevocationData(data);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -330,7 +330,7 @@
delete [] cbuf;
PerlRegEx r("^(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)Z$");
- StringArray sa = r.capture(sbuf);
+ std::vectorblocxx::String sa = convStringArray(r.capture(sbuf));
if(sa.size() != 7)
{
@@ -364,7 +364,7 @@
sbuf = String(cbuf);
delete [] cbuf;
- sa = r.capture(sbuf);
+ sa = convStringArray(r.capture(sbuf));
if(sa.size() != 7)
{
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=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp Sat Jun 12 14:33:19 2010
@@ -77,11 +77,11 @@
bool p = caConfig->exists(type2Section(type, true), "crlDistributionPoints");
if(p)
{
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "crlDistributionPoints"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "crlDistributionPoints")));
if(sp[0].equalsIgnoreCase("critical")) setCritical(true);
- StringArray::const_iterator it = sp.begin();
+ std::vectorblocxx::String::const_iterator it = sp.begin();
for(; it != sp.end(); ++it)
{
if((*it).indexOf(":") != String::npos)
@@ -123,7 +123,7 @@
void
CRLDistributionPointsExt::setCRLDistributionPoints(std::list<LiteralValue> dp)
{
- StringArray r = checkLiteralValueList(dp);
+ std::vectorblocxx::String r = checkLiteralValueList(dp);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -201,7 +201,7 @@
if(m_impl->altNameList.empty()) return false;
- StringArray r = checkLiteralValueList(m_impl->altNameList);
+ std::vectorblocxx::String r = checkLiteralValueList(m_impl->altNameList);
if(!r.empty())
{
LOGIT_DEBUG(r[0]);
@@ -210,36 +210,36 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
CRLDistributionPointsExt::verify() const
{
- blocxx::StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(m_impl->altNameList.empty())
{
- result.append(String("No value for CRLDistributionPointsExt."));
+ result.push_back(String("No value for CRLDistributionPointsExt."));
}
- result.appendArray(checkLiteralValueList(m_impl->altNameList));
+ appendArray(result, checkLiteralValueList(m_impl->altNameList));
LOGIT_DEBUG_STRINGARRAY("CRLDistributionPointsExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
CRLDistributionPointsExt::dump() const
{
- StringArray result;
- result.append("CRLDistributionPointsExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("CRLDistributionPointsExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
std::list< LiteralValue >::const_iterator it = m_impl->altNameList.begin();
for(; it != m_impl->altNameList.end(); ++it)
{
- result.appendArray((*it).dump());
+ appendArray(result, (*it).dump());
}
return result;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp Sat Jun 12 14:33:19 2010
@@ -83,7 +83,7 @@
const X509v3CRLGenerationExts& ext)
: m_impl(new CRLGenerationDataImpl(hours, ext))
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -123,7 +123,7 @@
void
CRLGenerationData::setExtensions(const X509v3CRLGenerationExts& ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -179,30 +179,30 @@
return m_impl->extensions.valid();
}
-blocxx::StringArray
+std::vectorblocxx::String
CRLGenerationData::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(m_impl->crlHours == 0)
{
- result.append(Format("invalid crlhours: %1", m_impl->crlHours).toString());
+ result.push_back(Format("invalid crlhours: %1", m_impl->crlHours).toString());
}
- result.appendArray(m_impl->extensions.verify());
+ appendArray(result, m_impl->extensions.verify());
LOGIT_DEBUG_STRINGARRAY("CRLGenerationData::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
CRLGenerationData::dump() const
{
- StringArray result;
- result.append("CRLGenerationData::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("CRLGenerationData::dump()");
- result.append("CRL Hours = " + String(m_impl->crlHours));
- result.appendArray(m_impl->extensions.dump());
+ result.push_back("CRL Hours = " + String(m_impl->crlHours));
+ appendArray(result, m_impl->extensions.dump());
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp Sat Jun 12 14:33:19 2010
@@ -286,22 +286,22 @@
// ----------------------------------------------------------------------------
-blocxx::StringArray
+std::vectorblocxx::String
CRLReason::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(m_impl->reason.equalsIgnoreCase("certificateHold"))
{
String err = checkHoldInstruction(m_impl->holdInstruction);
if(!err.empty())
{
- result.append(err);
+ result.push_back(err);
}
}
else if(!checkReason(m_impl->reason))
{
- result.append(Format("Invalid revoke reason", m_impl->reason));
+ result.push_back(Format("Invalid revoke reason", m_impl->reason));
}
// compromiseDate == 0 is now a valid date
@@ -312,22 +312,22 @@
// ----------------------------------------------------------------------------
-blocxx::StringArray
+std::vectorblocxx::String
CRLReason::dump() const
{
- StringArray result;
- result.append("CRLReason::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("CRLReason::dump()");
- result.append(Format("Revoke Reason = %1", m_impl->reason));
+ result.push_back(Format("Revoke Reason = %1", m_impl->reason));
if(m_impl->reason.equalsIgnoreCase("certificateHold"))
{
- result.append("hold Instruction =" + m_impl->holdInstruction);
+ result.push_back("hold Instruction =" + m_impl->holdInstruction);
}
else if(m_impl->reason.equalsIgnoreCase("keyCompromise") ||
m_impl->reason.equalsIgnoreCase("CACompromise"))
{
- result.append("compromise Date = " + String(m_impl->compromiseDate));
+ result.push_back("compromise Date = " + String(m_impl->compromiseDate));
}
return result;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp Sat Jun 12 14:33:19 2010
@@ -243,61 +243,61 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificateData::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(m_impl->version < 1 || m_impl->version > 3)
{
- result.append(Format("invalid version: %1", m_impl->version).toString());
+ result.push_back(Format("invalid version: %1", m_impl->version).toString());
}
if(!initHexCheck().isValid(m_impl->serial))
{
- result.append(Format("invalid serial: %1", m_impl->serial).toString());
+ result.push_back(Format("invalid serial: %1", m_impl->serial).toString());
}
if(m_impl->notBefore == 0)
{
- result.append(Format("invalid notBefore: %1", m_impl->notBefore).toString());
+ result.push_back(Format("invalid notBefore: %1", m_impl->notBefore).toString());
}
if(m_impl->notAfter <= m_impl->notBefore)
{
- result.append(Format("invalid notAfter: %1", m_impl->notAfter).toString());
+ result.push_back(Format("invalid notAfter: %1", m_impl->notAfter).toString());
}
- result.appendArray(m_impl->issuer.verify());
- result.appendArray(m_impl->subject.verify());
+ appendArray(result, m_impl->issuer.verify());
+ appendArray(result, m_impl->subject.verify());
// keysize ?
if(m_impl->publicKey.empty())
{
- result.append("invalid publicKey");
+ result.push_back("invalid publicKey");
}
- result.appendArray(m_impl->extensions.verify());
+ appendArray(result, m_impl->extensions.verify());
LOGIT_DEBUG_STRINGARRAY("CertificateData::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificateData::dump() const
{
- StringArray result;
- result.append("CertificateData::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("CertificateData::dump()");
- result.append("Version = " + String(m_impl->version));
- result.append("Serial = " + m_impl->serial);
- result.append("notBefore = " + String(m_impl->notBefore));
- result.append("notAfter = " + String(m_impl->notAfter));
- result.append("Fingerprint = " + m_impl->fingerprint);
- result.appendArray(m_impl->issuer.dump());
- result.appendArray(m_impl->subject.dump());
- result.append("Keysize = " + String(m_impl->keysize));
- result.append("public key algorithm = " + String(m_impl->pubkeyAlgorithm));
+ result.push_back("Version = " + String(m_impl->version));
+ result.push_back("Serial = " + m_impl->serial);
+ result.push_back("notBefore = " + String(m_impl->notBefore));
+ result.push_back("notAfter = " + String(m_impl->notAfter));
+ result.push_back("Fingerprint = " + m_impl->fingerprint);
+ appendArray(result, m_impl->issuer.dump());
+ appendArray(result, m_impl->subject.dump());
+ result.push_back("Keysize = " + String(m_impl->keysize));
+ result.push_back("public key algorithm = " + String(m_impl->pubkeyAlgorithm));
String pk;
for(size_t i = 0; i < m_impl->publicKey.size(); ++i)
@@ -306,8 +306,8 @@
s.format("%02x", (UInt8)m_impl->publicKey[i]);
pk += s + ":";
}
- result.append("public Key = " + pk);
- result.append("signatureAlgorithm = "+ String(m_impl->signatureAlgorithm));
+ result.push_back("public Key = " + pk);
+ result.push_back("signatureAlgorithm = "+ String(m_impl->signatureAlgorithm));
String s;
for(uint i = 0; i < m_impl->signature.size(); ++i)
@@ -317,8 +317,8 @@
s += d;
}
- result.append("Signature = " + s);
- result.appendArray(m_impl->extensions.dump());
+ result.push_back("Signature = " + s);
+ appendArray(result, m_impl->extensions.dump());
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.cpp Sat Jun 12 14:33:19 2010
@@ -104,7 +104,7 @@
void
CertificateData_Priv::setIssuerDN(const DNObject& issuer)
{
- StringArray r = issuer.verify();
+ std::vectorblocxx::String r = issuer.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -116,7 +116,7 @@
void
CertificateData_Priv::setSubjectDN(const DNObject& subject)
{
- StringArray r = subject.verify();
+ std::vectorblocxx::String r = subject.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -158,7 +158,7 @@
void
CertificateData_Priv::setExtensions(const X509v3CertificateExts& ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -276,7 +276,7 @@
n = BIO_get_mem_data(bioS, &ustringval);
setSerial( String(reinterpret_cast(ustringval), n).toUpperCase());
BIO_free(bioS);
-
+
// get notBefore
ASN1_TIME *t = X509_get_notBefore(x509);
char *cbuf = new char[t->length + 1];
@@ -288,7 +288,7 @@
delete [] cbuf;
PerlRegEx r("^(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)Z$");
- StringArray sa = r.capture(sbuf);
+ std::vectorblocxx::String sa = convStringArray(r.capture(sbuf));
if(sa.size() != 7)
{
@@ -323,7 +323,7 @@
sbuf = String(cbuf);
delete [] cbuf;
- sa = r.capture(sbuf);
+ sa = convStringArray(r.capture(sbuf));
if(sa.size() != 7)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp Sat Jun 12 14:33:19 2010
@@ -178,7 +178,7 @@
void
CertificateIssueData::setExtensions(const X509v3CertificateIssueExts& ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -258,41 +258,41 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificateIssueData::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(getStartDate() == 0)
{
- result.append(Format("invalid notBefore: %1", getStartDate()).toString());
+ result.push_back(Format("invalid notBefore: %1", getStartDate()).toString());
}
if(getEndDate() <= getStartDate())
{
- result.append(Format("invalid notAfter %1 <= notBefore %2",
+ result.push_back(Format("invalid notAfter %1 <= notBefore %2",
getEndDate(), getStartDate())
.toString());
}
- result.appendArray(m_impl->extensions.verify());
+ appendArray(result, m_impl->extensions.verify());
LOGIT_DEBUG_STRINGARRAY("CertificateIssueData::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificateIssueData::dump() const
{
- StringArray result;
- result.append("CertificateIssueData::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("CertificateIssueData::dump()");
- result.append("!CHANGING DATA! notBefore = " + String(getStartDate()));
- result.append("!CHANGING DATA! notAfter = " + String(getEndDate()));
- result.append("notAfter - notBefore (in days)= " +
+ result.push_back("!CHANGING DATA! notBefore = " + String(getStartDate()));
+ result.push_back("!CHANGING DATA! notAfter = " + String(getEndDate()));
+ result.push_back("notAfter - notBefore (in days)= " +
String((getEndDate() - getStartDate())/86400));
- result.append("MessageDigest = " + String(getMessageDigest()));
- result.appendArray(getExtensions().dump());
+ result.push_back("MessageDigest = " + String(getMessageDigest()));
+ appendArray(result, getExtensions().dump());
return result;
}
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=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp Sat Jun 12 14:33:19 2010
@@ -190,9 +190,9 @@
p = caConfig->exists(sectionName, "noticeNumbers");
if(p)
{
- StringArray a = PerlRegEx(",").
- split(caConfig->getValue(sectionName, "noticeNumbers"));
- StringArray::const_iterator it = a.begin();
+ std::vectorblocxx::String a = convStringArray(PerlRegEx(",").
+ split(caConfig->getValue(sectionName, "noticeNumbers")));
+ std::vectorblocxx::String::const_iterator it = a.begin();
for(; it != a.end(); ++it)
{
m_impl->noticeNumbers.push_back((*it).toInt32());
@@ -304,33 +304,33 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
UserNotice::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(m_impl->explicitText.length() > 200)
{
- result.append("explicitText to long");
+ result.push_back("explicitText to long");
}
if((m_impl->organization.empty() && !m_impl->noticeNumbers.empty()) ||
(!m_impl->organization.empty() && m_impl->noticeNumbers.empty()))
{
- result.append("organization and noticeNumbers must both present or absent");
+ result.push_back("organization and noticeNumbers must both present or absent");
}
LOGIT_DEBUG_STRINGARRAY("UserNotice::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
UserNotice::dump() const
{
- StringArray result;
- result.append("UserNotice::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("UserNotice::dump()");
- result.append("explicitText = "+ m_impl->explicitText);
- result.append("organization = " + m_impl->organization);
+ result.push_back("explicitText = "+ m_impl->explicitText);
+ result.push_back("organization = " + m_impl->organization);
String n;
std::list< blocxx::Int32 >::const_iterator it = m_impl->noticeNumbers.begin();
@@ -338,7 +338,7 @@
{
n += String(*it) + " ";
}
- result.append("noticeNumbers = " + n);
+ result.push_back("noticeNumbers = " + n);
return result;
}
@@ -469,7 +469,7 @@
void
CertificatePolicy::setCpsURI(const StringList& cpsURI)
{
- StringArray r = checkCpsURIs(cpsURI);
+ std::vectorblocxx::String r = checkCpsURIs(cpsURI);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -487,7 +487,7 @@
void
CertificatePolicy::setUserNoticeList(const std::list<UserNotice>& list)
{
- StringArray r = checkNoticeList(list);
+ std::vectorblocxx::String r = checkNoticeList(list);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -556,7 +556,7 @@
return false;
}
- StringArray r = checkCpsURIs(m_impl->cpsURI);
+ std::vectorblocxx::String r = checkCpsURIs(m_impl->cpsURI);
if(!r.empty())
{
LOGIT_DEBUG(r[0]);
@@ -572,46 +572,46 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificatePolicy::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
ValueCheck oidCheck = initOIDCheck();
if(m_impl->policyIdentifier.empty() ||
!oidCheck.isValid(m_impl->policyIdentifier))
{
- result.append(Format("invalid value for policyIdentifier: %1",
+ result.push_back(Format("invalid value for policyIdentifier: %1",
m_impl->policyIdentifier).toString());
}
- result.appendArray(checkCpsURIs(m_impl->cpsURI));
+ appendArray(result, checkCpsURIs(m_impl->cpsURI));
- result.appendArray(checkNoticeList(m_impl->noticeList));
+ appendArray(result, checkNoticeList(m_impl->noticeList));
LOGIT_DEBUG_STRINGARRAY("CertificatePolicy::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificatePolicy::dump() const
{
- StringArray result;
- result.append("CertificatePolicy::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("CertificatePolicy::dump()");
- result.append("policy Identifier = " + m_impl->policyIdentifier);
+ result.push_back("policy Identifier = " + m_impl->policyIdentifier);
StringList::const_iterator it1 = m_impl->cpsURI.begin();
for(; it1 != m_impl->cpsURI.end(); ++it1)
{
- result.append("CPS = " + (*it1));
+ result.push_back("CPS = " + (*it1));
}
std::list< UserNotice >::const_iterator it2 = m_impl->noticeList.begin();
for(; it2 != m_impl->noticeList.end(); ++it2)
{
- result.appendArray((*it2).dump());
+ appendArray(result, (*it2).dump());
}
return result;
}
@@ -648,10 +648,10 @@
}
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificatePolicy::checkCpsURIs(const StringList& cpsURIs) const
{
- StringArray result;
+ std::vectorblocxx::String result;
ValueCheck uriCheck = initURICheck();
StringList::const_iterator it = cpsURIs.begin();
@@ -659,20 +659,20 @@
{
if(!uriCheck.isValid(*it))
{
- result.append(Format("invalid URI: %1", *it).toString());
+ result.push_back(Format("invalid URI: %1", *it).toString());
}
}
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificatePolicy::checkNoticeList(const std::list<UserNotice>& list) const
{
- StringArray result;
+ std::vectorblocxx::String result;
std::list<UserNotice>::const_iterator it = list.begin();
for(;it != list.end(); it++)
{
- result.appendArray((*it).verify());
+ appendArray(result, (*it).verify());
}
return result;
}
@@ -689,7 +689,7 @@
: ExtensionBase()
, m_impl(new CertificatePoliciesExtImpl(policies))
{
- StringArray r = checkPolicies(policies);
+ std::vectorblocxx::String r = checkPolicies(policies);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -715,16 +715,16 @@
if(p)
{
ValueCheck check = initOIDCheck();
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "certificatePolicies"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "certificatePolicies")));
if(sp[0].equalsIgnoreCase("critical"))
{
setCritical(true);
- sp.remove(0);
+ sp.erase(sp.begin());
}
- StringArray::const_iterator it = sp.begin();
+ std::vectorblocxx::String::const_iterator it = sp.begin();
for(; it != sp.end(); ++it)
{
if((*it).equalsIgnoreCase("ia5org"))
@@ -786,7 +786,7 @@
void
CertificatePoliciesExt::setPolicies(const std::list<CertificatePolicy>& policies)
{
- StringArray r = checkPolicies(policies);
+ std::vectorblocxx::String r = checkPolicies(policies);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -861,7 +861,7 @@
LOGIT_DEBUG("No policy set");
return false;
}
- StringArray r = checkPolicies(m_impl->policies);
+ std::vectorblocxx::String r = checkPolicies(m_impl->policies);
if(!r.empty())
{
LOGIT_DEBUG(r[0]);
@@ -870,52 +870,52 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificatePoliciesExt::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(m_impl->policies.empty())
{
- result.append("No policy set");
+ result.push_back("No policy set");
}
- result.appendArray(checkPolicies(m_impl->policies));
+ appendArray(result, checkPolicies(m_impl->policies));
LOGIT_DEBUG_STRINGARRAY("CertificatePoliciesExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificatePoliciesExt::dump() const
{
- StringArray result;
- result.append("CertificatePoliciesExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("CertificatePoliciesExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("ia5org = " + blocxx::Bool(m_impl->ia5org).toString());
+ result.push_back("ia5org = " + blocxx::Bool(m_impl->ia5org).toString());
std::list< CertificatePolicy >::const_iterator it = m_impl->policies.begin();
for(; it != m_impl->policies.end(); ++it)
{
- result.appendArray((*it).dump());
+ appendArray(result, (*it).dump());
}
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
CertificatePoliciesExt::checkPolicies(const std::list<CertificatePolicy>& pl) const
{
- StringArray result;
+ std::vectorblocxx::String result;
std::list<CertificatePolicy>::const_iterator it = pl.begin();
for(;it != pl.end(); it++)
{
- result.appendArray((*it).verify());
+ appendArray(result, (*it).verify());
}
return result;
}
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=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp Sat Jun 12 14:33:19 2010
@@ -145,26 +145,26 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
RDNObject::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(m_impl->type.empty())
{
- result.append("type is empty");
+ result.push_back("type is empty");
}
if(m_impl->min != 0 && m_impl->value.UTF8Length() < m_impl->min)
{
- result.append("Value(" + m_impl->value +
+ result.push_back("Value(" + m_impl->value +
") is too small. Value has to be a minimal length of " +
String(m_impl->min));
}
if(m_impl->max != 0 && m_impl->value.UTF8Length() > m_impl->max)
{
- result.append("Value(" + m_impl->value +
+ result.push_back("Value(" + m_impl->value +
") is too long. Value has to be a maximal length of " +
String(m_impl->max));
}
@@ -174,16 +174,16 @@
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
RDNObject::dump() const
{
- StringArray result;
- result.append("RDNObject::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("RDNObject::dump()");
- result.append(m_impl->type + "=" + m_impl->value);
- result.append("Prompt:" + m_impl->prompt);
- result.append("Min:" + String(m_impl->min));
- result.append("Max:" + String(m_impl->max));
+ result.push_back(m_impl->type + "=" + m_impl->value);
+ result.push_back("Prompt:" + m_impl->prompt);
+ result.push_back("Min:" + String(m_impl->min));
+ result.push_back("Max:" + String(m_impl->max));
return result;
}
@@ -361,7 +361,7 @@
: m_impl(new DNObjectImpl())
{
m_impl->dn = dn;
- StringArray r = this->verify();
+ std::vectorblocxx::String r = this->verify();
if(!r.empty())
{
BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
@@ -388,7 +388,7 @@
void
DNObject::setDN(const std::list<RDNObject> &dn)
{
- StringArray r = checkRDNList(dn);
+ std::vectorblocxx::String r = checkRDNList(dn);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -428,7 +428,7 @@
LOGIT_DEBUG("empty DN");
return false;
}
- StringArray r = checkRDNList(m_impl->dn);
+ std::vectorblocxx::String r = checkRDNList(m_impl->dn);
if(!r.empty())
{
LOGIT_DEBUG(r[0]);
@@ -437,45 +437,45 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
DNObject::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(m_impl->dn.empty())
{
- result.append("empty DN");
+ result.push_back("empty DN");
}
- result.appendArray(checkRDNList(m_impl->dn));
+ appendArray(result, checkRDNList(m_impl->dn));
LOGIT_DEBUG_STRINGARRAY("DNObject::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
DNObject::checkRDNList(const std::list<RDNObject>& list) const
{
- StringArray result;
+ std::vectorblocxx::String result;
std::list<RDNObject>::const_iterator it = list.begin();
for(; it != list.end(); ++it)
{
- result.appendArray((*it).verify());
+ appendArray(result, (*it).verify());
}
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
DNObject::dump() const
{
- StringArray result;
- result.append("DNObject::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("DNObject::dump()");
std::list< RDNObject >::const_iterator it = m_impl->dn.begin();
for(; it != m_impl->dn.end(); ++it)
{
- result.appendArray((*it).dump());
+ appendArray(result, (*it).dump());
}
return result;
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=2669&r1=2668&r2=2669&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 Sat Jun 12 14:33:19 2010
@@ -104,7 +104,7 @@
*
for(uint j = 0 ; j < lines.size(); ++j) {
- StringArray vals = re.capture(lines[j]);
+ std::vectorblocxx::String vals = re.capture(lines[j]);
if(vals.size() != 3) {
@@ -207,7 +207,7 @@
Format(__("Cannot parse section %1."), dnSect).c_str());
}
StringList::const_iterator it = dnKeys.begin();
- Arrayblocxx::String > newDNSect;
+ std::vectorblocxx::String > newDNSect;
String lastFieldName;
String defaultValue;
@@ -242,7 +242,7 @@
}
if(defaultValue != "")
{
- Arrayblocxx::String line(2, "");
+ std::vectorblocxx::String line(2, "");
line[0] = lastFieldName + "_default";
line[1] = defaultValue;
newDNSect.push_back(line);
@@ -253,14 +253,14 @@
defaultValue = "";
}
- Arrayblocxx::String line(2, "");
+ std::vectorblocxx::String line(2, "");
line[0] = *it;
line[1] = ca.getConfig()->getValue(dnSect, *it);
newDNSect.push_back(line);
ca.getConfig()->deleteValue(dnSect, *it);
}
- Arrayblocxx::String >::const_iterator newIT;
+ std::vectorblocxx::String >::const_iterator newIT;
for(newIT = newDNSect.begin(); newIT != newDNSect.end(); ++newIT)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp Sat Jun 12 14:33:19 2010
@@ -80,9 +80,9 @@
{
String ct = caConfig->getValue(type2Section(type, true),
"extendedKeyUsage");
- StringArray sp = PerlRegEx("\\s*,\\s*").split(ct);
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*").split(ct));
- StringArray::const_iterator it = sp.begin();
+ std::vectorblocxx::String::const_iterator it = sp.begin();
if(sp[0].equalsIgnoreCase("critical"))
{
setCritical(true);
@@ -270,16 +270,16 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
ExtendedKeyUsageExt::verify() const
{
- blocxx::StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(m_impl->usage.empty())
{
- result.append(String("invalid ExtendedKeyUsageExt."));
+ result.push_back(String("invalid ExtendedKeyUsageExt."));
}
StringList::const_iterator it = m_impl->usage.begin();
@@ -287,26 +287,26 @@
{
if(!checkValue(*it))
{
- result.append(Format("invalid additionalOID(%1)", *it).toString());
+ result.push_back(Format("invalid additionalOID(%1)", *it).toString());
}
}
LOGIT_DEBUG_STRINGARRAY("ExtendedKeyUsageExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
ExtendedKeyUsageExt::dump() const
{
- StringArray result;
- result.append("ExtendedKeyUsageExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("ExtendedKeyUsageExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
StringList::const_iterator it = m_impl->usage.begin();
for(; it != m_impl->usage.end(); ++it)
{
- result.append("Extended KeyUsage = " + (*it));
+ result.push_back("Extended KeyUsage = " + (*it));
}
return result;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/ExtensionBase.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/ExtensionBase.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/ExtensionBase.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/ExtensionBase.cpp Sat Jun 12 14:33:19 2010
@@ -116,16 +116,16 @@
return m_impl->isPresent();
}
-blocxx::StringArray
+std::vectorblocxx::String
ExtensionBase::dump() const
{
- StringArray result;
- result.append("ExtensionBase::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("ExtensionBase::dump()");
- result.append("is Present = " + Bool(isPresent()).toString());
+ result.push_back("is Present = " + Bool(isPresent()).toString());
if(!isPresent()) return result;
- result.append("is Critical = " + Bool(isCritical()).toString());
+ result.push_back("is Critical = " + Bool(isCritical()).toString());
return result;
}
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=2669&r1=2668&r2=2669&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 Sat Jun 12 14:33:19 2010
@@ -26,6 +26,8 @@
#include "INIParser/INIParser.hpp"
#include
+#include "Utils.hpp"
+
using namespace blocxx;
// ===================================================================
@@ -36,7 +38,7 @@
// ===================================================================
Entry::Entry()
- : m_value(), m_comment()
+ : m_value(), m_comment()
{
}
@@ -136,18 +138,18 @@
: m_path(parentSection.m_path),
m_parser(parentSection.m_parser)
{
- m_path.append(key);
+ m_path.push_back(key);
- StringArray path;
+ std::vectorblocxx::String path;
StringList valueList;
-
+
valueList.clear();
valueList.push_back(""); // Currently no comment will be
// generated for this section
path.clear();
- path.append("section");
- path.appendArray (parentSection.m_path);
- path.append(key);
+ path.push_back("section");
+ appendArray (path, parentSection.m_path);
+ path.push_back(key);
if (m_parser)
{
m_parser->inifile.Write (path,
@@ -167,11 +169,11 @@
EntrySize Section::entrySize() const
{
StringList stringList;
- StringArray path;
+ std::vectorblocxx::String path;
path.clear();
stringList.clear();
- path.append("value");
- path.appendArray (m_path);
+ path.push_back("value");
+ appendArray (path, m_path);
if (m_parser)
{
m_parser->inifile.Dir (path, stringList);
@@ -183,16 +185,16 @@
EntrySize Section::sectionSize() const
{
StringList stringList;
- StringArray path;
+ std::vectorblocxx::String path;
path.clear();
stringList.clear();
- path.append("section");
- path.appendArray (m_path);
+ path.push_back("section");
+ appendArray (path, m_path);
if (m_parser)
{
m_parser->inifile.Dir (path, stringList);
}
- return stringList.size();
+ return stringList.size();
}
@@ -213,13 +215,13 @@
// -------------------------------------------------------------------
IniType Section::contains(const Key &key) const
{
- IniType ret = NO;
+ IniType ret = NO;
StringList stringList;
- StringArray path;
+ std::vectorblocxx::String path;
path.clear();
stringList.clear();
- path.append("value");
- path.appendArray (m_path);
+ path.push_back("value");
+ appendArray (path, m_path);
if (m_parser)
{
m_parser->inifile.Dir (path, stringList);
@@ -231,8 +233,8 @@
}
path.clear();
stringList.clear();
- path.append("section");
- path.appendArray (m_path);
+ path.push_back("section");
+ appendArray (path, m_path);
m_parser->inifile.Dir (path, stringList);
for(it = stringList.begin(); it != stringList.end(); ++it)
{
@@ -247,9 +249,9 @@
ret = SECTION;
}
}
- }
+ }
}
-
+
return ret;
}
@@ -258,12 +260,12 @@
{
StringList entryKeys;
StringList stringList;
- StringArray path;
-
+ std::vectorblocxx::String path;
+
path.clear();
stringList.clear();
- path.append("value");
- path.appendArray (m_path);
+ path.push_back("value");
+ appendArray (path, m_path);
if (m_parser)
{
// Evaluate all keys
@@ -284,12 +286,12 @@
{
EntryMap entrymap;
StringList stringList;
- StringArray path;
-
+ std::vectorblocxx::String path;
+
path.clear();
stringList.clear();
- path.append("value");
- path.appendArray (m_path);
+ path.push_back("value");
+ appendArray (path, m_path);
if (m_parser)
{
// Evaluate all keys
@@ -297,15 +299,15 @@
for (StringList::iterator it = stringList.begin();
it != stringList.end(); it++)
{
- //evaluate
- StringArray valuePath;
+ //evaluate
+ std::vectorblocxx::String valuePath;
StringList valueList;
Value value("");
Comment comment("");
-
+
valuePath = path;
valueList.clear();
- valuePath.append(*it);
+ valuePath.push_back(*it);
if (!m_parser->inifile.Read (valuePath,
valueList,
m_parser->HaveRewrites ())&&
@@ -316,9 +318,9 @@
}
valuePath.clear();
valueList.clear();
- valuePath.append("value_comment");
- valuePath.appendArray (m_path);
- valuePath.append(*it);
+ valuePath.push_back("value_comment");
+ appendArray (valuePath, m_path);
+ valuePath.push_back(*it);
if (!m_parser->inifile.Read (valuePath,
valueList,
m_parser->HaveRewrites ()) &&
@@ -342,12 +344,12 @@
EntryMap entryMap = getEntries();
blocxx::PosixRegEx reg(pattern, REG_EXTENDED | (icase ? REG_ICASE : 0));
EntryMap ret;
-
+
for (EntryMap::iterator it = entryMap.begin(); it !=entryMap.end(); it++ )
{
if( reg.match(it->first) )
{
- ret.insert (EntryMap::value_type(it->first,it->second));
+ ret.insert (EntryMap::value_type(it->first,it->second));
}
}
@@ -397,11 +399,11 @@
return false;
}
- StringArray path;
+ std::vectorblocxx::String path;
path.clear();
- path.append("value");
- path.appendArray (m_path);
- path.append(key);
+ path.push_back("value");
+ appendArray (path, m_path);
+ path.push_back(key);
return m_parser->inifile.Delete (path)==0 ? true:false ;
}
@@ -409,15 +411,15 @@
// -------------------------------------------------------------------
bool Section::addValue(const Key &key, const Value &value)
{
- StringArray valuePath;
+ std::vectorblocxx::String valuePath;
StringList valueList;
-
+
valueList.clear();
valueList.push_back(value);
valuePath.clear();
- valuePath.append("value");
- valuePath.appendArray (m_path);
- valuePath.append(key);
+ valuePath.push_back("value");
+ appendArray (valuePath, m_path);
+ valuePath.push_back(key);
if (m_parser)
{
return m_parser->inifile.Write (valuePath,
@@ -436,15 +438,15 @@
// adding value
ok = addValue (key, entry.getValue());
- StringArray valuePath;
+ std::vectorblocxx::String valuePath;
StringList valueList;
-
+
valueList.clear();
valueList.push_back(entry.getComment());
valuePath.clear();
- valuePath.append("value_comment");
- valuePath.appendArray (m_path);
- valuePath.append(key);
+ valuePath.push_back("value_comment");
+ appendArray (valuePath, m_path);
+ valuePath.push_back(key);
if (ok && m_parser)
{
return m_parser->inifile.Write (valuePath,
@@ -492,12 +494,12 @@
{
StringList sectionList;
StringList stringList;
- StringArray path;
-
+ std::vectorblocxx::String path;
+
path.clear();
stringList.clear();
- path.append("section");
- path.appendArray (m_path);
+ path.push_back("section");
+ appendArray (path, m_path);
if (m_parser)
{
// Evaluate all keys
@@ -518,12 +520,12 @@
{
SectionMap sectionMap;
StringList stringList;
- StringArray path;
-
+ std::vectorblocxx::String path;
+
path.clear();
stringList.clear();
- path.append("section");
- path.appendArray (m_path);
+ path.push_back("section");
+ appendArray (path, m_path);
if (m_parser)
{
// Evaluate all keys
@@ -534,7 +536,7 @@
//generate all sections
Section section(m_parser);
section.m_path = m_path;
- section.m_path.append (*it);
+ section.m_path.push_back (*it);
sectionMap.insert (SectionMap::value_type(*it,section));
}
}
@@ -550,12 +552,12 @@
SectionMap sectionMap = getSections();
blocxx::PosixRegEx reg(pattern, REG_EXTENDED | (icase ? REG_ICASE : 0));
SectionMap ret;
-
+
for (SectionMap::iterator it = sectionMap.begin(); it !=sectionMap.end(); it++ )
{
if( reg.match(it->first) )
{
- ret.insert (SectionMap::value_type(it->first,it->second));
+ ret.insert (SectionMap::value_type(it->first,it->second));
}
}
@@ -571,7 +573,7 @@
{
Section section (m_parser);
section.m_path = m_path;
- section.m_path.append (key);
+ section.m_path.push_back (key);
return section;
}
if (defaultSection != NULL)
@@ -593,11 +595,11 @@
return false;
}
- StringArray path;
+ std::vectorblocxx::String path;
path.clear();
- path.append("section");
- path.appendArray (m_path);
- path.append(key);
+ path.push_back("section");
+ appendArray (path, m_path);
+ path.push_back(key);
return m_parser->inifile.Delete (path) == 0 ? true:false;
}
@@ -606,14 +608,14 @@
// -------------------------------------------------------------------
bool Section::setComment( const Comment &comment)
{
- StringArray valuePath;
+ std::vectorblocxx::String valuePath;
StringList valueList;
-
+
valueList.clear();
valueList.push_back(comment);
valuePath.clear();
- valuePath.append("section_comment");
- valuePath.appendArray (m_path);
+ valuePath.push_back("section_comment");
+ appendArray (valuePath, m_path);
if (m_parser)
{
return m_parser->inifile.Write (valuePath,
@@ -628,7 +630,7 @@
// -------------------------------------------------------------------
Comment Section::getComment()
{
- StringArray valuePath;
+ std::vectorblocxx::String valuePath;
StringList valueList;
Comment comment;
@@ -637,11 +639,11 @@
// there is no comment on top level section available
return comment;
}
-
+
valuePath.clear();
valueList.clear();
- valuePath.append("section_comment");
- valuePath.appendArray (m_path);
+ valuePath.push_back("section_comment");
+ appendArray (valuePath, m_path);
if (m_parser && !m_parser->inifile.Read (valuePath,
valueList,
m_parser->HaveRewrites ()) &&
@@ -684,75 +686,75 @@
INIParser::~INIParser ()
{
if (parser->isStarted())
- parser->write();
+ parser->write();
}
// -------------------------------------------------------------------
void INIParser::initFiles (const String &filename)
{
- parser->initFiles (filename.c_str());
+ parser->initFiles (filename.c_str());
}
-
+
// -------------------------------------------------------------------
-void INIParser::initFiles (const blocxx::StringArray &fileList )
+void INIParser::initFiles (const std::vectorblocxx::String &fileList )
{
- parser->initFiles(fileList);
+ parser->initFiles(fileList);
}
// -------------------------------------------------------------------
-bool INIParser::initMachine (const blocxx::Array<Options> &options,
- const blocxx::StringArray &commentsDescr,
- const blocxx::Array<SectionDescr> §ionDescr,
- const blocxx::Array<EntryDescr> &entryDescr,
- const blocxx::Array<IoPatternDescr> &rewrites,
+bool INIParser::initMachine (const std::vector<Options> &options,
+ const std::vectorblocxx::String &commentsDescr,
+ const std::vector<SectionDescr> §ionDescr,
+ const std::vector<EntryDescr> &entryDescr,
+ const std::vector<IoPatternDescr> &rewrites,
const blocxx::String &subident)
{
// Resetting flags; set to "is init"
parser->reset();
// options
- StringArray opt;
+ std::vectorblocxx::String opt;
opt.clear();
for (unsigned int i = 0;iinitComments( commentsDescr );
- // sections
+ // sections
parser->initSection (sectionDescr);
-
- parser->initSubident (subident);
+
+ parser->initSubident (subident);
// entries
parser->initParam (entryDescr);
-
- // rewrite settings
+
+ // rewrite settings
parser->initRewrite (rewrites);
// commit initialization
@@ -789,11 +791,11 @@
{
return parser->parse () == 0;
}
-
+
// -------------------------------------------------------------------
void INIParser::UpdateIfModif ()
{
- parser->UpdateIfModif ();
+ parser->UpdateIfModif ();
}
// -------------------------------------------------------------------
@@ -807,32 +809,32 @@
bool SysConfig::initMachine ()
{
- blocxx::Array<Options> options;
- blocxx::StringArray commentsDescr;
- blocxx::Array<SectionDescr> sectionDescr;
- blocxx::Array<EntryDescr> entryDescr;
- blocxx::Array<IoPatternDescr> rewrites;
-
- options.append (GLOBAL_VALUES);
- options.append (LINE_CAN_CONTINUE);
- options.append (COMMENTS_LAST);
- options.append (JOIN_MULTILINE);
-
- commentsDescr.append("^[ \t]*#.*$");
- commentsDescr.append("#.*");
- commentsDescr.append("^[ \t]*$");
+ std::vector<Options> options;
+ std::vectorblocxx::String commentsDescr;
+ std::vector<SectionDescr> sectionDescr;
+ std::vector<EntryDescr> entryDescr;
+ std::vector<IoPatternDescr> rewrites;
+
+ options.push_back (GLOBAL_VALUES);
+ options.push_back (LINE_CAN_CONTINUE);
+ options.push_back (COMMENTS_LAST);
+ options.push_back (JOIN_MULTILINE);
+
+ commentsDescr.push_back("^[ \t]*#.*$");
+ commentsDescr.push_back("#.*");
+ commentsDescr.push_back("^[ \t]*$");
IoPatternDescr pattern = { "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)\"", "%s=\"%s\""};
- EntryDescr eDescr = {pattern, "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)", "([^\"]*)\"" , true};
- entryDescr.append (eDescr);
+ EntryDescr eDescr = {pattern, "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)", "([^\"]*)\"" , true};
+ entryDescr.push_back (eDescr);
IoPatternDescr pattern2 = {"([a-zA-Z0-9_]+)[ \t]*=[ \t]*([^\"]*[^ \t\"]|)[ \t]*$", "%s=\"%s\""};
EntryDescr eDescr2 = {pattern2, "", "" , false};
- entryDescr.append (eDescr2);
+ entryDescr.push_back (eDescr2);
IoPatternDescr pattern3 = {"^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t]*=[ \t]*'([^']*)'", "%s='%s'" };
EntryDescr eDescr3 = {pattern3, "([a-zA-Z_][a-zA-Z0-9_]*)[ \t]*=[ \t]*'([^']*)", "([^']*)'" , true};
- entryDescr.append (eDescr3);
+ entryDescr.push_back (eDescr3);
if (!INIParser::initMachine (options, commentsDescr, sectionDescr,
entryDescr, rewrites))
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=2669&r1=2668&r2=2669&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 Sat Jun 12 14:33:19 2010
@@ -321,7 +321,7 @@
private:
- blocxx::StringArray m_path;
+ std::vectorblocxx::String m_path;
blocxx::IntrusiveReference<IniParser> m_parser;
};
@@ -403,11 +403,11 @@
* using namespace ca_mgm;
* using namespace ca_mgm::INI;
*
- * blocxx::Array<Options> options; // Options like NO_NESTED_SECTIONS, LINE_CAN_CONTINUE, ...
- * blocxx::StringArray commentsDescr; // Regular expression of the comments description
- * blocxx::Array<SectionDescr> sectionDescr; // Regular expression of a section description
- * blocxx::Array<EntryDescr> entryDescr; // Regular expressions for entries (keys/values).
- * blocxx::Array<IoPatternDescr> rewrites; // rules for writing key/value
+ * std::vector<Options> options; // Options like NO_NESTED_SECTIONS, LINE_CAN_CONTINUE, ...
+ * std::vectorblocxx::String commentsDescr; // Regular expression of the comments description
+ * std::vector<SectionDescr> sectionDescr; // Regular expression of a section description
+ * std::vector<EntryDescr> entryDescr; // Regular expressions for entries (keys/values).
+ * std::vector<IoPatternDescr> rewrites; // rules for writing key/value
*
* options.append (GLOBAL_VALUES); // Values at the top level(not in section) are allowed
* options.append (LINE_CAN_CONTINUE); // if there is \ at the end of line,
@@ -486,7 +486,7 @@
* Sets parser to multiple file mode and sets the glob-expressions.
* @param fileList list of glob-expressions
*/
- void initFiles (const blocxx::StringArray &fileList );
+ void initFiles (const std::vectorblocxx::String &fileList );
/**
* Sets flags and regular expressions.
@@ -535,11 +535,11 @@
* have indented subsections, use this. Example: " " "\t"
* @return true if successful
*/
- virtual bool initMachine (const blocxx::Array<Options> &options,
- const blocxx::StringArray &commentsDescr,
- const blocxx::Array<SectionDescr> §ionDescr,
- const blocxx::Array<EntryDescr> &entryDescr,
- const blocxx::Array<IoPatternDescr> &rewrites,
+ virtual bool initMachine (const std::vector<Options> &options,
+ const std::vectorblocxx::String &commentsDescr,
+ const std::vector<SectionDescr> §ionDescr,
+ const std::vector<EntryDescr> &entryDescr,
+ const std::vector<IoPatternDescr> &rewrites,
const blocxx::String &subident = "");
/**
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.cpp Sat Jun 12 14:33:19 2010
@@ -28,7 +28,7 @@
using std::pair;
using namespace blocxx;
-String pathToString(const StringArray&p)
+String pathToString(const std::vectorblocxx::String&p)
{
if (p.empty()) return String(".");
String v;
@@ -74,7 +74,7 @@
void IniSection::initSection (const String&name,const String&comment,int rb, int wb)
{
String k = ip->changeCase (name);
-
+
IniSection s (ip);
IniSectionIdxIterator sxi;
if (!ip->repeatNames () && (sxi = isections.find (k)) != isections.end ())
@@ -109,7 +109,7 @@
isections.insert (IniSectionIndex::value_type (k, --container.end ()));
}
-IniSection& IniSection::findSection(const StringArray&path, int from)
+IniSection& IniSection::findSection(const std::vectorblocxx::String&path, int from)
{
String k = ip->changeCase (path[from]);
IniSectionIdxIterator v = isections.find(k);
@@ -122,7 +122,7 @@
return from+1 >= (int)path.size() ? s : s.findSection (path, from+1);
}
-int IniSection::findEndFromUp (const StringArray&path, int wanted, int found, int from)
+int IniSection::findEndFromUp (const std::vectorblocxx::String&path, int wanted, int found, int from)
{
@@ -183,7 +183,7 @@
for (; sxi != sxe; ++sxi)
{
- printf ("{%s @%p}\n", sxi->first.c_str (), &*sxi->second);
+ printf ("{%s @%p}\n", sxi->first.c_str (), &*sxi->second);
}
printf ("{Values}\n");
@@ -193,7 +193,7 @@
for (; exi != exe; ++exi)
{
- printf ("{%s @%p}\n", exi->first.c_str (), &*exi->second);
+ printf ("{%s @%p}\n", exi->first.c_str (), &*exi->second);
}
printf("%s>\n", name.c_str());
@@ -221,10 +221,10 @@
String k = ip->changeCase (ci->s ().getName ());
isections.insert (IniSectionIndex::value_type (k, ci));
}
- }
+ }
}
-int IniSection::getMyValue (const StringArray &p, StringList &out, int what, int depth)
+int IniSection::getMyValue (const std::vectorblocxx::String &p, StringList &out, int what, int depth)
{
String k = ip->changeCase (p[depth]);
// Find all values and return them according to repeat_names
@@ -244,10 +244,10 @@
results.push_back (String (e.getValue ()));
break;
case 1: out.push_back (String (e.getComment()));
- results.push_back (String (e.getComment()));
+ results.push_back (String (e.getComment()));
break;
default: out.push_back (String (e.getReadBy ()));
- results.push_back (String (e.getReadBy ()));
+ results.push_back (String (e.getReadBy ()));
break;
}
}
@@ -268,7 +268,7 @@
return -1;
}
-int IniSection::getValue (const StringArray&p, StringList&out,int what, int depth)
+int IniSection::getValue (const std::vectorblocxx::String&p, StringList&out,int what, int depth)
{
String k = ip->changeCase (p[depth]);
if ( depth + 1 < int(p.size()))
@@ -292,7 +292,7 @@
}
// Read calls us with the path length >= 2
-int IniSection::getSectionProp (const StringArray&p, StringList&out, int what, int depth)
+int IniSection::getSectionProp (const std::vectorblocxx::String&p, StringList&out, int what, int depth)
{
String k = ip->changeCase (p[depth]);
// Find the matching sections.
@@ -332,7 +332,7 @@
else if (what == 1)
{
out.push_back (String (s.rewrite_by));
- results.push_back (String (s.rewrite_by));
+ results.push_back (String (s.rewrite_by));
}
else
{
@@ -359,7 +359,7 @@
return -1;
}
-int IniSection::getAll (const StringArray&p, SectionAll&out, int depth)
+int IniSection::getAll (const std::vectorblocxx::String&p, SectionAll&out, int depth)
{
if (depth < int(p.size ()))
{
@@ -415,7 +415,7 @@
return m;
}
-int IniSection::Delete (const StringArray&p)
+int IniSection::Delete (const std::vectorblocxx::String&p)
{
if (ip->isFlat ())
return delValueFlat (p);
@@ -432,7 +432,7 @@
return -1;
}
-int IniSection::Write (const StringArray&p, const StringList&v, bool rewrite)
+int IniSection::Write (const std::vectorblocxx::String&p, const StringList&v, bool rewrite)
{
if (ip->isFlat ())
return setValueFlat (p, v);
@@ -456,7 +456,7 @@
return -1;
}
-int IniSection::setSectionProp (const StringArray&p,const StringList&in, int what, int depth)
+int IniSection::setSectionProp (const std::vectorblocxx::String&p,const StringList&in, int what, int depth)
{
String k = ip->changeCase (p[depth]);
// Find the matching sections.
@@ -563,7 +563,7 @@
isections.erase (sxi);
}
-int IniSection::delSection(const StringArray&p, int depth)
+int IniSection::delSection(const std::vectorblocxx::String&p, int depth)
{
String k = ip->changeCase (p[depth]);
@@ -603,9 +603,9 @@
return 0;
}
-int IniSection::WriteAll (const StringArray&p, const SectionAll& in, int depth)
+int IniSection::WriteAll (const std::vectorblocxx::String&p, const SectionAll& in, int depth)
{
- LIMAL_SLOG_INFO (logger, "This function has not been tested cause it is not needed at the moment.");
+ LIMAL_SLOG_INFO (logger, "This function has not been tested cause it is not needed at the moment.");
if (depth < int(p.size ()))
{
// recurse to find the starting section
@@ -649,7 +649,7 @@
container.clear (); // bye, old data
for (SectionList::iterator i = l.begin(); i != l.end(); ++i)
{
-
+
SectionAll mitem = *i;
kind = mitem.kind;
@@ -686,7 +686,7 @@
return ret;
}
-int IniSection::setMyValue (const StringArray &p, const StringList&in, int what, int depth)
+int IniSection::setMyValue (const std::vectorblocxx::String &p, const StringList&in, int what, int depth)
{
// assert (depth == p.size ()); //not, it can have a .comment suffix
String k = ip->changeCase (p[depth]);
@@ -764,7 +764,7 @@
return 0;
}
-int IniSection::setValue (const StringArray&p,const StringList&in,int what, int depth)
+int IniSection::setValue (const std::vectorblocxx::String&p,const StringList&in,int what, int depth)
{
String k = ip->changeCase (p[depth]);
// Find the matching sections.
@@ -829,7 +829,7 @@
}
}
-int IniSection::delValue (const StringArray&p, int depth)
+int IniSection::delValue (const std::vectorblocxx::String&p, int depth)
{
String k = ip->changeCase (p[depth]);
// Find the matching sections.
@@ -877,7 +877,7 @@
return 0;
}
-int IniSection::dirValueFlat (const StringArray&p, StringList&l)
+int IniSection::dirValueFlat (const std::vectorblocxx::String&p, StringList&l)
{
// This function used to discard p and always return Dir (.)
// #21574
@@ -892,7 +892,7 @@
return myDir (l, VALUE);
}
-int IniSection::getValueFlat (const StringArray&p, StringList&out)
+int IniSection::getValueFlat (const std::vectorblocxx::String&p, StringList&out)
{
if (!p.size ())
return -1;
@@ -902,7 +902,7 @@
return getMyValue (p, out, want_comment, 0);
}
-int IniSection::delValueFlat (const StringArray&p)
+int IniSection::delValueFlat (const std::vectorblocxx::String&p)
{
if (!p.size ())
return -1;
@@ -912,7 +912,7 @@
return 0;
}
-int IniSection::setValueFlat (const StringArray&p, const StringList &in)
+int IniSection::setValueFlat (const std::vectorblocxx::String&p, const StringList &in)
{
if (!p.size ())
return -1;
@@ -922,7 +922,7 @@
return setMyValue (p, in, want_comment, 0);
}
-int IniSection::Read (const StringArray&p, StringList&out, bool rewrite)
+int IniSection::Read (const std::vectorblocxx::String&p, StringList&out, bool rewrite)
{
if (ip->isFlat ())
return getValueFlat (p, out);
@@ -948,9 +948,9 @@
return -1;
}
-int IniSection::ReadAll (const StringArray&p, SectionAll&out)
+int IniSection::ReadAll (const std::vectorblocxx::String&p, SectionAll&out)
{
- LIMAL_SLOG_INFO (logger, "This function has not been tested cause it is not needed at the moment.");
+ LIMAL_SLOG_INFO (logger, "This function has not been tested cause it is not needed at the moment.");
if (p.size() >= 1 && p[0] == "all")
{
return getAll (p, out, 1);
@@ -961,7 +961,7 @@
}
}
-int IniSection::Dir (const StringArray&p, StringList&l)
+int IniSection::Dir (const std::vectorblocxx::String&p, StringList&l)
{
if (ip->isFlat ())
return dirValueFlat (p, l);
@@ -980,7 +980,7 @@
LIMAL_SLOG_ERROR (logger, "I do not know what to dir from "<< pathToString(p).c_str());
return -1;
}
-int IniSection::dirHelper (const StringArray&p, StringList&out,int get_sect,int depth)
+int IniSection::dirHelper (const std::vectorblocxx::String&p, StringList&out,int get_sect,int depth)
{
if (depth >= int(p.size()))
{
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=2669&r1=2668&r2=2669&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 Sat Jun 12 14:33:19 2010
@@ -24,7 +24,7 @@
#include <map>
#define INIPARSER "IniParser"
-
+
namespace LIMAL_NAMESPACE
{
namespace INI
@@ -41,8 +41,8 @@
{
blocxx::String kind; //section,value
blocxx::String name;
- blocxx::String type; // section_type
- blocxx::String file; // "rewrite", section_file
+ blocxx::String type; // section_type
+ blocxx::String file; // "rewrite", section_file
blocxx::String comment;
blocxx::String value; // if kind == value
SectionList sectionList;
@@ -226,7 +226,7 @@
class IniSection : public IniBase
{
private:
-
+
// huh??? allow_values, allow_sections and allow_subsub
// were never actuially used
@@ -277,7 +277,7 @@
* @param depth path index
* @return 0 in case of success
*/
- int getMyValue (const blocxx::StringArray &p,
+ int getMyValue (const std::vectorblocxx::String &p,
StringList &out, int what, int depth);
/**
* Get a value on a path
@@ -289,7 +289,7 @@
* path[depth] in current "scope"
* @return 0 in case of success
*/
- int getValue (const blocxx::StringArray&p,
+ int getValue (const std::vectorblocxx::String&p,
StringList&out,int what, int depth = 0);
/**
* Get section property -- comment or read-by
@@ -301,7 +301,7 @@
* path[depth] in current "scope"
* @return 0 in case of success
*/
- int getSectionProp (const blocxx::StringArray&p,
+ int getSectionProp (const std::vectorblocxx::String&p,
StringList&out,int what, int depth = 0);
/**
* Get a complete subtree
@@ -312,7 +312,7 @@
* path[depth] in current "scope"
* @return 0 in case of success
*/
- int getAll (const blocxx::StringArray&p,
+ int getAll (const std::vectorblocxx::String&p,
SectionAll&out, int depth);
/**
* Gets data for this section and all its values and subsections
@@ -336,19 +336,19 @@
* @param depth see getSectionProp
* @return 0 in case of success
*/
- int dirHelper (const blocxx::StringArray&p,
+ int dirHelper (const std::vectorblocxx::String&p,
StringList&out,int sections,int depth = 0);
/**
* Set a value (or list of them if repeat_names) in this section
* It would be enough to pass only k instead of p and depth,
* but then the error messages would not know the whole path
* @param p path
- * @param in value to set
+ * @param in value to set
* @param what 0 -- value, 1 -- comment, other -- read-by.
* @param depth path index
* @return 0
*/
- int setMyValue (const blocxx::StringArray &p,
+ int setMyValue (const std::vectorblocxx::String &p,
const StringList&in, int what, int depth);
/**
* Set value on path. Creates recursively all non-existing subsections.
@@ -358,7 +358,7 @@
* @param depth see getSectionProp
* @return 0
*/
- int setValue (const blocxx::StringArray&p,
+ int setValue (const std::vectorblocxx::String&p,
const StringList&in,int what, int depth = 0);
/**
* Set section comment or read-by. Creates recursively all non-existing subsections.
@@ -368,7 +368,7 @@
* @param depth see getSectionProp
* @return 0
*/
- int setSectionProp (const blocxx::StringArray&p,
+ int setSectionProp (const std::vectorblocxx::String&p,
const StringList&in, int what, int depth);
/**
@@ -383,7 +383,7 @@
* @param depth see getSectionProp
* @return 0 in case of success
*/
- int delValue (const blocxx::StringArray&p,
+ int delValue (const std::vectorblocxx::String&p,
int depth);
/**
* Delete section on path. Deletes also all its subsections.
@@ -391,7 +391,7 @@
* @param depth see getSectionProp
* @return 0 in case of success
*/
- int delSection (const blocxx::StringArray&p,
+ int delSection (const std::vectorblocxx::String&p,
int depth);
/**
@@ -414,7 +414,7 @@
* @param out output
* @return 0 in case of success
*/
- int getValueFlat (const blocxx::StringArray&p,
+ int getValueFlat (const std::vectorblocxx::String&p,
StringList&out);
/**
* Set value in flat mode.
@@ -422,16 +422,16 @@
* @param out input
* @return 0 in case of success
*/
- int setValueFlat (const blocxx::StringArray&p,
+ int setValueFlat (const std::vectorblocxx::String&p,
const StringList& in);
/**
* Delete value in flat mode
*/
- int delValueFlat (const blocxx::StringArray&p);
+ int delValueFlat (const std::vectorblocxx::String&p);
/**
* Get list of values in flat mode.
*/
- int dirValueFlat (const blocxx::StringArray&p, StringList&l);
+ int dirValueFlat (const std::vectorblocxx::String&p, StringList&l);
// IniSection ();
public:
/** explicit uninitialized constructor */
@@ -463,7 +463,7 @@
if (&s == this)
{
return;
- }
+ }
IniBase::operator = (s);
ip = s.ip;
end_comment = s.end_comment; rewrite_by = s.rewrite_by;
@@ -474,8 +474,8 @@
virtual ~IniSection () {}
- /**
- * this is a constructor for newly added sections --> sets dirty
+ /**
+ * this is a constructor for newly added sections --> sets dirty
* @param ip parser to take options from
* @param n name of section
*/
@@ -521,7 +521,7 @@
*/
int getSubSectionRewriteBy (const char*name);
- /**
+ /**
* If there is no comment at the beginning and no values and no
* sections, it is better to set is as comment at the beginning.
* Sets also dirty flag.
@@ -542,7 +542,7 @@
* @param from recursion depth
* @return Found ini section iterator
*/
- IniSection& findSection(const blocxx::StringArray&path, int from = 0);
+ IniSection& findSection(const std::vectorblocxx::String&path, int from = 0);
/**
* If currently parsed end-section-tag hasn't matched currently
* processed section by name, we need to find the best possible match
@@ -556,7 +556,7 @@
* @param from let unset, current path index
* @return index to path
*/
- int findEndFromUp(const blocxx::StringArray&path,
+ int findEndFromUp(const std::vectorblocxx::String&path,
int wanted, int found = -1, int from = 0);
/**
@@ -568,20 +568,20 @@
* Generic interface to SCR::Read
* @param rewrite a #19066 hack - if rewriting is active, .st accesses rewrite_by
*/
- int Read (const blocxx::StringArray&p, StringList&out, bool rewrite);
+ int Read (const std::vectorblocxx::String&p, StringList&out, bool rewrite);
/**
* Get all properties and values of a section.
*/
- int ReadAll (const blocxx::StringArray&p, SectionAll&out);
+ int ReadAll (const std::vectorblocxx::String&p, SectionAll&out);
/**
* Generic interface to SCR::Dir
*/
- int Dir (const blocxx::StringArray&p, StringList&out);
+ int Dir (const std::vectorblocxx::String&p, StringList&out);
/**
* Generic interface to SCR::Write
* @param rewrite a #19066 hack - if rewriting is active, .st accesses rewrite_by
*/
- int Write (const blocxx::StringArray&p, const StringList&v, bool rewrite);
+ int Write (const std::vectorblocxx::String&p, const StringList&v, bool rewrite);
/**
* Set all properties and values for a section.
* No recursive creation of the specified path.
@@ -590,14 +590,14 @@
* @param depth see getSectionProp
* @return 0 in case of success
*/
- int WriteAll (const blocxx::StringArray&p,
- const SectionAll& in, int depth);
+ int WriteAll (const std::vectorblocxx::String&p,
+ const SectionAll& in, int depth);
/**
* Generic delete for values, sections.
* @param p path to delete
* @return 0: success
*/
- int Delete (const blocxx::StringArray&p);
+ int Delete (const std::vectorblocxx::String&p);
// used by IniParser::write
IniIterator getContainerBegin ();
@@ -620,7 +620,7 @@
};
/**
- * A single container
+ * A single container
*/
class IniContainerElement
{
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=2669&r1=2668&r2=2669&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 Sat Jun 12 14:33:19 2010
@@ -70,7 +70,7 @@
/**
* Debugging.
*/
-void printPath(const StringArray&p, const char*c = "")
+void printPath(const std::vectorblocxx::String&p, const char*c = "")
{
int i = 0;
int len = p.size();
@@ -93,7 +93,7 @@
-void IniParser::initFiles (const StringArray&f)
+void IniParser::initFiles (const std::vectorblocxx::String&f)
{
multiple_files = true;
files.clear ();
@@ -107,13 +107,13 @@
file = fn;
multiple_files = false;
}
-void IniParser::initOptions (const StringArray&options)
+void IniParser::initOptions (const std::vectorblocxx::String&options)
{
int len = options.size();
for (int i = 0;iblocxx::String&comm)
{
int len = comm.size();
linecomments.clear ();
@@ -172,7 +172,7 @@
for (int i = 0; i < len; i++)
{
String s = comm[i];
- Array <PosixRegEx> & regexes = ('^' == s[0]) ?
+ std::vector<PosixRegEx> & regexes = ('^' == s[0]) ?
linecomments : comments;
PosixRegEx r;
if (r.compile (s, REG_EXTENDED | (ignore_case ? REG_ICASE : 0)))
@@ -182,7 +182,7 @@
}
}
-void IniParser::initSection (const Array<SectionDescr>& sect)
+void IniParser::initSection (const std::vector<SectionDescr>& sect)
{
int len = sect.size();
// compile them to regex_t
@@ -214,7 +214,7 @@
}
-void IniParser::initParam (const Array<EntryDescr>& entries)
+void IniParser::initParam (const std::vector<EntryDescr>& entries)
{
int len = entries.size();
// compile them to regex_t
@@ -235,7 +235,7 @@
{
LIMAL_SLOG_ERROR (logger,"Bad regexp(multiline): "<<
entry.multiEnd.c_str());
- pa.multiline_valid = false;
+ pa.multiline_valid = false;
}
}
else
@@ -244,7 +244,7 @@
entry.multiBegin.c_str());
}
}
-
+
if (!pa.line.rx.compile ( String (entry.line.regExpr),
REG_EXTENDED | (ignore_case ? REG_ICASE : 0)))
{
@@ -439,7 +439,7 @@
size_t i;
// stack of section names
- StringArray path;
+ std::vectorblocxx::String path;
//
// read line
@@ -486,7 +486,7 @@
{
RegexMatch m (params[matched_by].end, line);
if (m)
- {
+ {
// it is the end of broken line
state = 0;
val = val + (join_multiline ? "" : "\n") + m[1];
@@ -650,7 +650,7 @@
val = m[2];
line = m.rest;
break;
- }
+ }
}
if (i != params.size ())
{
@@ -760,7 +760,7 @@
{
if (timestamp != getTimeStamp())
{
- LIMAL_SLOG_ERROR (logger, "Data file '" << file.c_str() << "' was changed externaly!");
+ LIMAL_SLOG_ERROR (logger, "Data file '" << file.c_str() << "' was changed externaly!");
parse ();
}
}
@@ -815,7 +815,7 @@
if (ci->t () == SECTION)
{
IniSection&s = ci->s ();
- int wb = s.getRewriteBy (); // bug #19066
+ int wb = s.getRewriteBy (); // bug #19066
String filename = getFileName (s.getName (), wb);
if (!s.isDirty ()) {
@@ -882,7 +882,7 @@
snprintf (out_buffer, 2048, sections[readby].begin.out.c_str (), ini.getName());
of << indent << out_buffer << "\n";
}
-
+
IniIterator
ci = ini.getContainerBegin (),
ce = ini.getContainerEnd ();
@@ -947,7 +947,7 @@
}
else
{
- tmp.toLowerCase();
+ tmp.toLowerCase();
if (first_upper
&& tmp.length() > 0)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h Sat Jun 12 14:33:19 2010
@@ -40,7 +40,7 @@
{
public:
/** Matched subexpressions (0 - the whole regex) */
- blocxx::StringArray matches;
+ std::vectorblocxx::String matches;
/** The unmatched part of the String */
blocxx::String rest;
@@ -73,7 +73,7 @@
rm_matches[i].rm_eo - rm_matches[i].rm_so));
}
}
-
+
};
/**
@@ -187,23 +187,23 @@
/**
* Regular expression for comments over whole line.
*/
- blocxx::Arrayblocxx::PosixRegEx linecomments;
+ std::vectorblocxx::PosixRegEx linecomments;
/**
* Regular expressions for comments over part of the line.
*/
- blocxx::Arrayblocxx::PosixRegEx comments;
+ std::vectorblocxx::PosixRegEx comments;
/**
* Regular expressions for sections.
*/
- blocxx::Array<section> sections;
+ std::vector<section> sections;
/**
* Regular expressions for parameters (keys/values).
*/
- blocxx::Array<param> params;
+ std::vector<param> params;
/**
* Regular expressions for rewrite rules.
*/
- blocxx::Array<IoPattern> rewrites;
+ std::vector<IoPattern> rewrites;
/**
* opened file for scanner
@@ -231,7 +231,7 @@
/**
* Array of globe-expressions.
*/
- blocxx::StringArray files;
+ std::vectorblocxx::String files;
/**
* Open ini file.
@@ -287,32 +287,32 @@
* Sets parser to multiple file mode and sets the glob-expressions.
* @param f list of glob-expressions
*/
- void initFiles (const blocxx::StringArray&f);
+ void initFiles (const std::vectorblocxx::String&f);
/**
* Sets flags and regular expressions.
*/
- void initOptions (const blocxx::StringArray&options);
+ void initOptions (const std::vectorblocxx::String&options);
/**
* Sets flags and regular expressions.
- */
- void initRewrite (const blocxx::Array<IoPatternDescr>&rewriteArray);
+ */
+ void initRewrite (const std::vector<IoPatternDescr>&rewriteArray);
/**
* Sets flags and regular expressions.
- */
+ */
void initSubident (const blocxx::String ident);
/**
* Sets flags and regular expressions.
- */
- void initComments (const blocxx::StringArray&comm);
+ */
+ void initComments (const std::vectorblocxx::String&comm);
/**
* Sets flags and regular expressions.
- */
- void initSection (const blocxx::Array<SectionDescr>& sect);
+ */
+ void initSection (const std::vector<SectionDescr>& sect);
/**
* Sets flags and regular expressions.
- */
- void initParam (const blocxx::Array<EntryDescr>& entries);
-
+ */
+ void initParam (const std::vector<EntryDescr>& entries);
+
bool isStarted() { return started; }
void reset() {
ignore_case_regexps = ignore_case = prefer_uppercase = first_upper
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=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp Sat Jun 12 14:33:19 2010
@@ -75,7 +75,7 @@
: ExtensionBase()
, m_impl(new IssuerAlternativeNameExtImpl(copyIssuer, alternativeNameList))
{
- StringArray r = checkLiteralValueList(alternativeNameList);
+ std::vectorblocxx::String r = checkLiteralValueList(alternativeNameList);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -99,11 +99,11 @@
bool p = caConfig->exists(type2Section(type, true), "issuerAltName");
if(p)
{
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "issuerAltName"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "issuerAltName")));
if(sp[0].equalsIgnoreCase("critical")) setCritical(true);
- StringArray::const_iterator it = sp.begin();
+ std::vectorblocxx::String::const_iterator it = sp.begin();
for(; it != sp.end(); ++it)
{
if((*it).indexOf(":") != String::npos)
@@ -169,7 +169,7 @@
void
IssuerAlternativeNameExt::setAlternativeNameList(const std::list<LiteralValue> &alternativeNameList)
{
- StringArray r = checkLiteralValueList(alternativeNameList);
+ std::vectorblocxx::String r = checkLiteralValueList(alternativeNameList);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -264,7 +264,7 @@
LOGIT_DEBUG("return IssuerAlternativeNameExt::valid() is false");
return false;
}
- StringArray r = checkLiteralValueList(m_impl->altNameList);
+ std::vectorblocxx::String r = checkLiteralValueList(m_impl->altNameList);
if(!r.empty())
{
LOGIT_DEBUG(r[0]);
@@ -274,39 +274,39 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
IssuerAlternativeNameExt::verify() const
{
- blocxx::StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(!m_impl->issuerCopy && m_impl->altNameList.empty())
{
- result.append(String("invalid value for IssuerAlternativeNameExt"));
+ result.push_back(String("invalid value for IssuerAlternativeNameExt"));
}
- result.appendArray(checkLiteralValueList(m_impl->altNameList));
+ appendArray(result, checkLiteralValueList(m_impl->altNameList));
LOGIT_DEBUG_STRINGARRAY("IssuerAlternativeNameExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
IssuerAlternativeNameExt::dump() const
{
- StringArray result;
- result.append("IssuerAlternativeNameExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("IssuerAlternativeNameExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("Issuer:copy = " + Bool(m_impl->issuerCopy).toString());
+ result.push_back("Issuer:copy = " + Bool(m_impl->issuerCopy).toString());
std::list< LiteralValue >::const_iterator it = m_impl->altNameList.begin();
for(; it != m_impl->altNameList.end(); ++it)
{
- result.appendArray((*it).dump());
+ appendArray(result, (*it).dump());
}
return result;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp Sat Jun 12 14:33:19 2010
@@ -53,10 +53,10 @@
}
// -------------------------------------------------------------------
-StringArray
+std::vectorblocxx::String
LDAPUrlImpl::getKnownSchemes() const
{
- StringArray schemes(2);
+ std::vectorblocxx::String schemes(2);
schemes[0] = "ldap";
schemes[1] = "ldaps";
return schemes;
@@ -90,7 +90,7 @@
"attrs", "scope", "filter", "exts", NULL
};
ca_mgm::url::ParamMap pmap;
- StringArray parr( getQueryStringArray());
+ std::vectorblocxx::String parr( getQueryStringArray());
if( parr.size() <= 4)
{
for(size_t i=0; iblocxx::String parr(4);
ca_mgm::url::ParamMap::const_iterator p;
for(p=pmap.begin(); p!=pmap.end(); ++p)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.hpp Sat Jun 12 14:33:19 2010
@@ -40,7 +40,7 @@
virtual UrlBase *
clone() const;
- virtual StringArray
+ virtual std::vectorblocxx::String
getKnownSchemes() const;
virtual void
Modified: limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp Sat Jun 12 14:33:19 2010
@@ -73,7 +73,7 @@
LiteralValue::LiteralValue(const String &type, const String &value)
: m_impl(new LiteralValueImpl(type, value))
{
- StringArray r = this->verify();
+ std::vectorblocxx::String r = this->verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -84,7 +84,7 @@
LiteralValue::LiteralValue(const String& value)
: m_impl(new LiteralValueImpl())
{
- StringArray sp = PerlRegEx("^([\\w\\d.]+):(.*)$").capture(value);
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("^([\\w\\d.]+):(.*)$").capture(value));
if(sp[1].equalsIgnoreCase("email"))
{
@@ -157,7 +157,7 @@
m_impl->literalType = type;
m_impl->literalValue = value;
- StringArray r = this->verify();
+ std::vectorblocxx::String r = this->verify();
if(!r.empty())
{
m_impl->literalType = dType;
@@ -175,7 +175,7 @@
m_impl->literalValue = value;
- StringArray r = this->verify();
+ std::vectorblocxx::String r = this->verify();
if(!r.empty())
{
m_impl->literalValue = dValue;
@@ -250,7 +250,7 @@
String instance;
String realm = "";
- StringArray sa = getValue().tokenize("@/");
+ std::vectorblocxx::String sa = convStringArray(getValue().tokenize("@/"));
String sectname1 = getValue()+String(num);
if(sa.size() == 2) // primary@REALM
@@ -375,10 +375,10 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
LiteralValue::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(m_impl->literalType == "email")
{
@@ -386,7 +386,7 @@
if(!check.isValid(m_impl->literalValue))
{
LOGIT_DEBUG("Wrong LiteralValue for type 'email': " << m_impl->literalValue);
- result.append(Format("Wrong LiteralValue for type 'email': %1",
+ result.push_back(Format("Wrong LiteralValue for type 'email': %1",
m_impl->literalValue).toString());
}
}
@@ -396,7 +396,7 @@
if(!check.isValid(m_impl->literalValue))
{
LOGIT_DEBUG("Wrong LiteralValue for type 'URI': " << m_impl->literalValue);
- result.append(Format("Wrong LiteralValue for type 'URI': %1",
+ result.push_back(Format("Wrong LiteralValue for type 'URI': %1",
m_impl->literalValue).toString());
}
}
@@ -406,7 +406,7 @@
if(!check.isValid(m_impl->literalValue))
{
LOGIT_DEBUG("Wrong LiteralValue for type 'DNS': " << m_impl->literalValue);
- result.append(Format("Wrong LiteralValue for type 'DNS': %1",
+ result.push_back(Format("Wrong LiteralValue for type 'DNS': %1",
m_impl->literalValue).toString());
}
}
@@ -416,7 +416,7 @@
if(!check.isValid(m_impl->literalValue))
{
LOGIT_DEBUG("Wrong LiteralValue for type 'RID': " << m_impl->literalValue);
- result.append(Format("Wrong LiteralValue for type 'RID': %1",
+ result.push_back(Format("Wrong LiteralValue for type 'RID': %1",
m_impl->literalValue).toString());
}
}
@@ -430,7 +430,7 @@
if(!check.isValid(m_impl->literalValue))
{
LOGIT_DEBUG("Wrong LiteralValue for type 'IP': " << m_impl->literalValue);
- result.append(Format("Wrong LiteralValue for type 'IP': %1",
+ result.push_back(Format("Wrong LiteralValue for type 'IP': %1",
m_impl->literalValue).toString());
}
}
@@ -441,7 +441,7 @@
if(!check.isValid(m_impl->literalValue))
{
LOGIT_DEBUG("Wrong LiteralValue for type '1.3.6.1.4.1.311.20.2.3': " << m_impl->literalValue);
- result.append(Format("Wrong LiteralValue for type '1.3.6.1.4.1.311.20.2.3': %1",
+ result.push_back(Format("Wrong LiteralValue for type '1.3.6.1.4.1.311.20.2.3': %1",
m_impl->literalValue).toString());
}
}
@@ -451,7 +451,7 @@
if(!check.isValid(m_impl->literalValue))
{
LOGIT_DEBUG("Wrong LiteralValue for type '1.3.6.1.5.2.2': " << m_impl->literalValue);
- result.append(Format("Wrong LiteralValue for type '1.3.6.1.5.2.2': %1",
+ result.push_back(Format("Wrong LiteralValue for type '1.3.6.1.5.2.2': %1",
m_impl->literalValue).toString());
}
}
@@ -464,7 +464,7 @@
else
{
LOGIT_DEBUG("Unknown Type in LiteralValue: " << m_impl->literalType);
- result.append(Format("Unknown Type in LiteralValue: %1",
+ result.push_back(Format("Unknown Type in LiteralValue: %1",
m_impl->literalType).toString());
}
return result;
@@ -476,13 +476,13 @@
return (m_impl->literalType + ":" + m_impl->literalValue);
}
-blocxx::StringArray
+std::vectorblocxx::String
LiteralValue::dump() const
{
- StringArray result;
- result.append("LiteralValue::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("LiteralValue::dump()");
- result.append(m_impl->literalType + ":" + m_impl->literalValue);
+ result.push_back(m_impl->literalType + ":" + m_impl->literalValue);
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp Sat Jun 12 14:33:19 2010
@@ -76,7 +76,7 @@
String data(out.data(), out.size());
- Array< std::map > list;
+ std::vector< std::map > list;
String info;
String cert;
@@ -84,7 +84,7 @@
String issuer;
String keyID;
- StringArray dataList = PerlRegEx("\n").split(data);
+ std::vectorblocxx::String dataList = convStringArray(PerlRegEx("\n").split(data));
if(dataList.size() <= 1) {
@@ -100,7 +100,7 @@
PerlRegEx subjectRegex("^subject=(.*)\\s*$");
PerlRegEx issuerRegex("^issuer=(.*)\\s*$");
- StringArray::const_iterator lineIT = dataList.begin() + 1;
+ std::vectorblocxx::String::const_iterator lineIT = dataList.begin() + 1;
for(; lineIT != dataList.end(); ++lineIT) {
@@ -110,7 +110,7 @@
if(endRegex.match(*lineIT)) {
- StringArray ia = endRegex.capture(*lineIT);
+ std::vectorblocxx::String ia = convStringArray(endRegex.capture(*lineIT));
if(ia.size() == 2 && ia[1] == info) {
std::map v;
@@ -140,7 +140,7 @@
if(beginRegex.match(*lineIT)) {
- StringArray ia = beginRegex.capture(*lineIT);
+ std::vectorblocxx::String ia = convStringArray(beginRegex.capture(*lineIT));
if(ia.size() == 2 ) {
info = ia[1];
@@ -154,7 +154,7 @@
if(keyIDRegex.match(*lineIT)) {
- StringArray ia = keyIDRegex.capture(*lineIT);
+ std::vectorblocxx::String ia = convStringArray(keyIDRegex.capture(*lineIT));
if(ia.size() == 2 ) {
keyID = ia[1];
@@ -165,7 +165,7 @@
}
} else if(subjectRegex.match(*lineIT)) {
- StringArray ia = subjectRegex.capture(*lineIT);
+ std::vectorblocxx::String ia = convStringArray(subjectRegex.capture(*lineIT));
if(ia.size() == 2 ) {
subject = ia[1];
@@ -176,7 +176,7 @@
}
} else if(issuerRegex.match(*lineIT)) {
- StringArray ia = issuerRegex.capture(*lineIT);
+ std::vectorblocxx::String ia = convStringArray(issuerRegex.capture(*lineIT));
if(ia.size() == 2 ) {
issuer = ia[1];
@@ -199,11 +199,11 @@
String serverCert;
String serverKey;
String srvIssuerCert;
- Array<String> restCA;
+ std::vector<String> restCA;
// search for the server certificate
- Array< std::map >::iterator certMap = list.begin();
+ std::vector< std::map >::iterator certMap = list.begin();
for(; certMap != list.end(); ++certMap) {
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp Sat Jun 12 14:33:19 2010
@@ -213,7 +213,7 @@
CerrAppender::STR_DEFAULT_MESSAGE_PATTERN);
LogAppenderRef appRef(new CerrAppender(
- components, categories, mformat
+ components,categories, mformat
));
#if BLOCXX_LIBRARY_VERSION >= 5
@@ -246,7 +246,9 @@
identity);
LogAppenderRef appRef(new SyslogAppender(
- components, categories, mformat, log_tag, facility
+ components,
+ categories,
+ mformat, log_tag, facility
));
#if BLOCXX_LIBRARY_VERSION >= 5
@@ -275,7 +277,9 @@
NullAppender::STR_DEFAULT_MESSAGE_PATTERN);
LogAppenderRef appRef(new NullAppender(
- components, categories, mformat
+ components,
+ categories,
+ mformat
));
#if BLOCXX_LIBRARY_VERSION >= 5
@@ -328,7 +332,9 @@
}
LogAppenderRef appRef(new FileAppender(
- components, categories, filename.c_str(),
+ components,
+ categories,
+ filename.c_str(),
mformat, maxLogFileSize, maxBackupIndex
));
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=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp Sat Jun 12 14:33:19 2010
@@ -104,7 +104,7 @@
debugCmd += String(bits);
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -135,7 +135,7 @@
LOGIT_ERROR("openssl stderr:" << errOutput);
LOGIT_DEBUG("openssl stdout:" << stdOutput);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
BLOCXX_THROW(ca_mgm::RuntimeException,
Format(__("openssl command failed: %1"), msg).c_str());
@@ -197,7 +197,7 @@
debugCmd += "-passin env:pass ";
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -243,7 +243,7 @@
LOGIT_ERROR("openssl stderr:" << errOutput);
LOGIT_DEBUG("openssl stdout:" << stdOutput);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
BLOCXX_THROW(ca_mgm::RuntimeException,
Format(__("openssl command failed: %1"), msg).c_str());
@@ -310,7 +310,7 @@
debugCmd += "-key " + keyFile + " ";
debugCmd += "-out " + outFile + " ";
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -341,7 +341,7 @@
LOGIT_ERROR("openssl stderr:" << errOutput);
LOGIT_DEBUG("openssl stdout:" << stdOutput);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
BLOCXX_THROW(ca_mgm::RuntimeException,
Format(__("openssl command failed: %1"), msg).c_str());
@@ -433,7 +433,7 @@
debugCmd += "-outdir " + outDir + " ";
}
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
//LOGIT_DEBUG("PASSWORD: " << caPassword);
@@ -465,7 +465,7 @@
LOGIT_ERROR("openssl stderr:" << errOutput);
LOGIT_DEBUG("openssl stdout:" << stdOutput);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
BLOCXX_THROW(ca_mgm::RuntimeException,
Format(__("openssl command failed: %1"), msg).c_str());
@@ -572,7 +572,7 @@
}
}
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -603,7 +603,7 @@
LOGIT_ERROR("openssl stderr:" << errOutput);
LOGIT_DEBUG("openssl stdout:" << stdOutput);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
BLOCXX_THROW(ca_mgm::RuntimeException,
Format(__("openssl command failed: %1"), msg).c_str());
@@ -672,7 +672,7 @@
debugCmd += "-nouniqueDN ";
}
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -703,7 +703,7 @@
LOGIT_ERROR("openssl stderr:" << errOutput);
LOGIT_DEBUG("openssl stdout:" << stdOutput);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
BLOCXX_THROW(ca_mgm::RuntimeException,
Format(__("openssl command failed: %1"), msg).c_str());
@@ -754,7 +754,7 @@
debugCmd += "-passin env:pass ";
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -788,7 +788,7 @@
LOGIT_ERROR("openssl stderr:" << errOutput);
LOGIT_DEBUG("openssl stdout:" << stdOutput);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
BLOCXX_THROW(ca_mgm::RuntimeException,
Format(__("openssl command failed: %1"), msg).c_str());
@@ -845,7 +845,7 @@
debugCmd += certFile;
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -869,8 +869,8 @@
__("Executing openssl command failed."), e);
}
- StringArray lines = PerlRegEx("\n").split(stdOutput);
- StringArray::const_iterator line;
+ std::vectorblocxx::String lines = convStringArray(PerlRegEx("\n").split(stdOutput));
+ std::vectorblocxx::String::const_iterator line;
String result;
String errMsg;
@@ -880,7 +880,7 @@
for(line = lines.begin(); line != lines.end(); ++line)
{
- StringArray sa = ok.capture(*line);
+ std::vectorblocxx::String sa = convStringArray(ok.capture(*line));
if(sa.size() == 2 && sa[1] == "OK")
{
@@ -888,7 +888,7 @@
break;
}
- sa = error.capture(*line);
+ sa = convStringArray(error.capture(*line));
if(sa.size() == 3)
{
@@ -926,7 +926,7 @@
debugCmd += "-status " + serial;
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -950,8 +950,8 @@
__("Executing openssl command failed."), e);
}
- StringArray lines = PerlRegEx("\n").split(errOutput);
- StringArray::const_iterator line;
+ std::vectorblocxx::String lines = convStringArray(PerlRegEx("\n").split(errOutput));
+ std::vectorblocxx::String::const_iterator line;
String errMsg;
@@ -959,7 +959,7 @@
for(line = lines.begin(); line != lines.end(); ++line)
{
- StringArray sa = serialMatch.capture(*line);
+ std::vectorblocxx::String sa = convStringArray(serialMatch.capture(*line));
if(sa.size() == 2)
{
@@ -996,7 +996,7 @@
else
{
PerlRegEx r("^[[:xdigit:]]+:([[:xdigit:]]+[\\d-]*)$");
- StringArray sa = r.capture(certificateName);
+ std::vectorblocxx::String sa = convStringArray(r.capture(certificateName));
if(sa.size() != 2)
{
@@ -1023,7 +1023,7 @@
debugCmd += keyFile + " ";
debugCmd += "-passin env:PASSWORD ";
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -1110,10 +1110,10 @@
break;
}
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
-
+
blocxx::String randfile(::tempnam("/tmp/", ".rand-"));
blocxx::EnvVars env;
env.addVar("PATH", "/usr/bin/");
@@ -1157,7 +1157,7 @@
path::removeFile(outFileName);
path::removeFile(randfile);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
BLOCXX_THROW(ca_mgm::RuntimeException,
Format(__("openssl command failed: %1"), msg).c_str());
@@ -1237,7 +1237,7 @@
isOutPassSet = true;
}
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -1303,7 +1303,7 @@
path::removeFile(outFileName);
path::removeFile(randfile);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
if(PerlRegEx("unable to load Private Key", PCRE_CASELESS).match(msg))
{
@@ -1371,7 +1371,7 @@
break;
}
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -1418,7 +1418,7 @@
path::removeFile(outFileName);
path::removeFile(randfile);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
BLOCXX_THROW(ca_mgm::RuntimeException,
Format(__("openssl command failed: %1"), msg).c_str());
@@ -1478,7 +1478,7 @@
break;
}
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -1525,7 +1525,7 @@
path::removeFile(outFileName);
path::removeFile(randfile);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
BLOCXX_THROW(ca_mgm::RuntimeException,
Format(__("openssl command failed: %1"), msg).c_str());
@@ -1618,7 +1618,7 @@
debugCmd += inFileName3 + " ";
}
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -1686,7 +1686,7 @@
path::removeFile(outFileName);
path::removeFile(randfile);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
if(PerlRegEx("unable to load Private Key", PCRE_CASELESS).match(msg))
{
@@ -1765,7 +1765,7 @@
debugCmd += "-nodes ";
}
- StringArray cmd = PerlRegEx("\\s").split(debugCmd);
+ std::vectorblocxx::String cmd = convStringArray(PerlRegEx("\\s").split(debugCmd));
LOGIT_DEBUG("Command: " << debugCmd);
@@ -1831,7 +1831,7 @@
path::removeFile(outFileName);
path::removeFile(randfile);
- StringArray sa = errOutput.tokenize("\n\r");
+ std::vectorblocxx::String sa = convStringArray(errOutput.tokenize("\n\r"));
String msg = (sa.empty()? "" : sa[0]);
if(PerlRegEx("invalid password", PCRE_CASELESS).match(msg))
{
@@ -1854,11 +1854,11 @@
return out;
}
-blocxx::Arrayblocxx::String
+std::vectorblocxx::String
OpenSSLUtils::listCA(const String &repository)
{
std::list<String> tmpList;
- Array<String> retList;
+ std::vector<String> retList;
int r = path::readDir(tmpList, repository, false);
@@ -1907,7 +1907,7 @@
String s(b.data(), b.size());
PerlRegEx r("^([[:xdigit:]]+)$");
- StringArray sa = r.capture(s);
+ std::vectorblocxx::String sa = convStringArray(r.capture(s));
if(sa.size() == 2)
{
@@ -1928,8 +1928,8 @@
const String &dnString,
const String &repository)
{
- Array db = OpenSSLUtils::parseCAMDB(caName, repository);
- Array::const_iterator it;
+ std::vector db = OpenSSLUtils::parseCAMDB(caName, repository);
+ std::vector::const_iterator it;
for(it = db.begin(); it != db.end(); ++it)
{
@@ -1960,9 +1960,9 @@
String cam(b.data(), b.size());
- StringArray lines = PerlRegEx("\n").split(cam);
+ std::vectorblocxx::String lines = convStringArray(PerlRegEx("\n").split(cam));
- StringArray::const_iterator line;
+ std::vectorblocxx::String::const_iterator line;
String camNew;
for(line = lines.begin(); line != lines.end(); ++line)
@@ -1979,25 +1979,25 @@
}
-blocxx::Arrayblocxx::String >
+std::vectorblocxx::String >
OpenSSLUtils::parseCAMDB(const String &caName,
const String &repository)
{
- Array ret;
+ std::vector ret;
ByteBuffer b = LocalManagement::readFile(repository + "/" + caName + "/cam.txt");
String cam(b.data(), b.size());
- StringArray lines = PerlRegEx("\n").split(cam);
+ std::vectorblocxx::String lines = convStringArray(PerlRegEx("\n").split(cam));
- StringArray::const_iterator line;
+ std::vectorblocxx::String::const_iterator line;
for(line = lines.begin(); line != lines.end(); ++line)
{
PerlRegEx r("^([[:xdigit:]]+[\\d-]*)\\s(.*)$");
- StringArray col = r.capture(*line);
+ std::vectorblocxx::String col = convStringArray(r.capture(*line));
if(col.size() != 3)
{
@@ -2005,7 +2005,7 @@
continue;
}
- Array<String> a;
+ std::vector<String> a;
a.push_back(col[1]);
a.push_back(col[2]);
ret.push_back(a);
@@ -2013,25 +2013,25 @@
return ret;
}
-blocxx::Arrayblocxx::String >
+std::vectorblocxx::String >
OpenSSLUtils::parseIndexTXT(const String &caName,
const String &repository)
{
- Array ret;
+ std::vector ret;
ByteBuffer b = LocalManagement::readFile(repository + "/" + caName + "/index.txt");
String cam(b.data(), b.size());
- StringArray lines = PerlRegEx("\n").split(cam);
+ std::vectorblocxx::String lines = convStringArray(PerlRegEx("\n").split(cam));
- StringArray::const_iterator line;
+ std::vectorblocxx::String::const_iterator line;
for(line = lines.begin(); line != lines.end(); ++line)
{
PerlRegEx r("^(\\w)\\s([\\d\\w]+)\\s([\\w\\d,.]*)\\s([[:xdigit:]]+)\\s(\\w+)\\s(.*)$");
- StringArray col = r.capture(*line);
+ std::vectorblocxx::String col = convStringArray(r.capture(*line));
if(col.size() != 7)
{
@@ -2039,7 +2039,7 @@
continue;
}
- Array<String> a;
+ std::vector<String> a;
a.push_back(col[1]);
a.push_back(col[2]);
a.push_back(col[3]);
@@ -2051,11 +2051,11 @@
return ret;
}
-blocxx::Array >
+std::vector >
OpenSSLUtils::listRequests(const String &caName,
const String &repository)
{
- Array > ret;
+ std::vector > ret;
std::list<String> tmpList;
String reqDir = repository + "/" + caName + "/req/";
@@ -2073,7 +2073,7 @@
tmpList.sort();
- Array camdb = OpenSSLUtils::parseCAMDB(caName, repository);
+ std::vector camdb = OpenSSLUtils::parseCAMDB(caName, repository);
std::list<String>::const_iterator cont;
path::PathInfo pi(reqDir);
@@ -2089,7 +2089,7 @@
PerlRegEx requestR("^([[:xdigit:]]+)-?(\\d*)\\.req$");
- StringArray sa = requestR.capture(*cont);
+ std::vectorblocxx::String sa = convStringArray(requestR.capture(*cont));
if(sa.size() <= 1)
{
@@ -2114,7 +2114,7 @@
reqLine["request"] = md5;
reqLine["date"] = date;
- Array::const_iterator dbIT;
+ std::vector::const_iterator dbIT;
for(dbIT = camdb.begin(); dbIT != camdb.end(); ++dbIT)
{
if( (*dbIT)[0] == md5 )
@@ -2134,7 +2134,7 @@
sa.clear();
while(1)
{
- StringArray saTmp = PerlRegEx("(.*?[^\\\\])(\\/|$)").capture(subject);
+ std::vectorblocxx::String saTmp = convStringArray(PerlRegEx("(.*?[^\\\\])(\\/|$)").capture(subject));
uint pos = 0;
if(saTmp.size() >=2)
@@ -2159,7 +2159,7 @@
PerlRegEx quoteR("\\\\/");
- StringArray::const_iterator it;
+ std::vectorblocxx::String::const_iterator it;
for(it = sa.begin(); it != sa.end(); ++it)
{
String toMatch = quoteR.replace(*it, "/", true);
@@ -2203,11 +2203,11 @@
return ret;
}
-blocxx::Array >
+std::vector >
OpenSSLUtils::listCertificates(const String &caName,
const String &repository)
{
- Array > ret;
+ std::vector > ret;
std::list<String> tmpList;
String certDir = repository + "/" + caName + "/newcerts/";
@@ -2225,7 +2225,7 @@
tmpList.sort();
- Array indexTXT = OpenSSLUtils::parseIndexTXT(caName, repository);
+ std::vector indexTXT = OpenSSLUtils::parseIndexTXT(caName, repository);
std::list<String>::const_iterator cont;
path::PathInfo pi(certDir);
@@ -2241,7 +2241,7 @@
PerlRegEx certR("^([[:xdigit:]]+):([[:xdigit:]]+-?\\d*)\\.pem$");
- StringArray sa = certR.capture(*cont);
+ std::vectorblocxx::String sa = convStringArray(certR.capture(*cont));
if(sa.size() != 3)
{
@@ -2258,7 +2258,7 @@
certLine["serial"] = serial;
certLine["certificate"] = serial + ":" + md5;
- Array::const_iterator dbIT;
+ std::vector::const_iterator dbIT;
for(dbIT = indexTXT.begin(); dbIT != indexTXT.end(); ++dbIT)
{
if( (*dbIT)[3] == serial )
@@ -2295,7 +2295,7 @@
sa.clear();
while(1)
{
- StringArray saTmp = PerlRegEx("(.*?[^\\\\])(\\/|$)").capture(subject);
+ std::vectorblocxx::String saTmp = convStringArray(PerlRegEx("(.*?[^\\\\])(\\/|$)").capture(subject));
uint pos = 0;
if(saTmp.size() >=2)
@@ -2320,7 +2320,7 @@
PerlRegEx quoteR("\\\\/");
- StringArray::const_iterator it;
+ std::vectorblocxx::String::const_iterator it;
String lastPart;
for(it = sa.begin(); it != sa.end(); ++it)
{
@@ -2427,11 +2427,11 @@
{
tmpl = LocalManagement::readFile(repository + "/openssl.cnf.tmpl");
- StringArray tmplArray = PerlRegEx("\n").split(String(tmpl.data(), tmpl.size()), true);
+ std::vectorblocxx::String tmplArray = convStringArray(PerlRegEx("\n").split(String(tmpl.data(), tmpl.size()), true));
PerlRegEx dirR("^\\s*dir\\s*=");
String newConf;
- StringArray::const_iterator line;
+ std::vectorblocxx::String::const_iterator line;
for(line = tmplArray.begin(); line != tmplArray.end(); ++line)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.hpp Sat Jun 12 14:33:19 2010
@@ -158,7 +158,7 @@
const String &outPassword,
const String &algorithm = "des3");
- static blocxx::Arrayblocxx::String
+ static std::vectorblocxx::String
listCA(const String &repository = REPOSITORY);
static blocxx::String
@@ -175,19 +175,19 @@
const String &md5,
const String &repository = REPOSITORY);
- static blocxx::Arrayblocxx::String >
+ static std::vectorblocxx::String >
parseCAMDB(const String &caName,
const String &repository = REPOSITORY);
- static blocxx::Arrayblocxx::String >
+ static std::vectorblocxx::String >
parseIndexTXT(const String &caName,
const String &repository = REPOSITORY);
- static blocxx::Array >
+ static std::vector >
listRequests(const String &caName,
const String &repository = REPOSITORY);
- static blocxx::Array >
+ static std::vector >
listCertificates(const String &caName,
const String &repository = REPOSITORY);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp Sat Jun 12 14:33:19 2010
@@ -80,17 +80,17 @@
size_t pos, lastpos = 0;
String spath = path.toString()+"/";
int ret = 0;
-
+
if(path.empty())
return ENOENT;
-
+
// skip ./
if(path.relative())
lastpos=2;
// skip /
else
lastpos=1;
-
+
while((pos = spath.indexOf('/',lastpos)) != String::npos ) {
String dir = spath.substring(0,pos);
ret = ::mkdir(dir.c_str(), mode);
@@ -142,11 +142,12 @@
if ( !p.exists() ) {
return 0;
}
-
+
if ( !p.isDir() ) {
return ENOTDIR ;
}
-
+
+ //std::vectorblocxx::String cmd;
StringArray cmd;
cmd.push_back(RM_COMMAND);
cmd.push_back("-rf");
@@ -207,28 +208,28 @@
int copyDir( const PathName & srcpath, const PathName & destpath )
{
LOGIT_DEBUG("copyDir " << srcpath << " -> " << destpath );
-
+
PathInfo sp( srcpath );
if ( !sp.isDir() ) {
return ENOTDIR;
}
-
+
PathInfo dp( destpath );
if ( !dp.isDir() ) {
return ENOTDIR;
}
-
+
PathInfo tp( destpath + srcpath.baseName() );
if ( tp.exists() ) {
return EEXIST ;
}
-
+
StringArray cmd;
cmd.push_back(CP_COMMAND);
cmd.push_back("-a");
cmd.push_back(srcpath.toString());
cmd.push_back(destpath.toString());
-
+
String stdOutput;
String errOutput;
int status = -1;
@@ -282,7 +283,7 @@
const PathName & path, bool dots )
{
retlist.clear();
-
+
LOGIT_DEBUG("readDir " << path << ' ');
DIR * dir = ::opendir( path.toString().c_str() );
@@ -290,10 +291,10 @@
LOGIT_ERROR("readDir ::opendir returned " << errno2String(errno));
return errno;
}
-
+
struct dirent *entry;
while ( (entry = ::readdir( dir )) != 0 ) {
-
+
if ( entry->d_name[0] == '.' ) {
if ( !dots )
continue;
@@ -304,9 +305,9 @@
}
retlist.push_back( entry->d_name );
}
-
+
::closedir( dir );
-
+
return 0;
}
@@ -325,7 +326,7 @@
if ( ::unlink( path.toString().c_str() ) == -1 ) {
if(errno == ENOENT)
{
- // remove a file which does not exist: the result is ok
+ // remove a file which does not exist: the result is ok
// The file does not exist after this call. So return 0.
return 0;
}
@@ -371,10 +372,10 @@
<< "returned: " << errno2String(EINVAL));
return EINVAL;
}
-
+
PathInfo dp( dest );
if ( dp.isDir() ) {
- LOGIT_ERROR("copyFile " << file << " -> " << dest << ' '
+ LOGIT_ERROR("copyFile " << file << " -> " << dest << ' '
<< "returned: " << errno2String(EISDIR));
return EISDIR;
}
@@ -383,7 +384,7 @@
cmd.push_back(CP_COMMAND);
cmd.push_back(file.toString());
cmd.push_back(dest.toString());
-
+
String stdOutput;
String errOutput;
int status = -1;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/RequestData.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/RequestData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/RequestData.cpp Sat Jun 12 14:33:19 2010
@@ -169,42 +169,42 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
RequestData::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(m_impl->version < 1 || m_impl->version > 1)
{
- result.append(Format("invalid version: %1", m_impl->version).toString());
+ result.push_back(Format("invalid version: %1", m_impl->version).toString());
}
- result.appendArray(m_impl->subject.verify());
+ appendArray(result, m_impl->subject.verify());
// keysize ?
if(m_impl->publicKey.empty())
{
- result.append("invalid publicKey");
+ result.push_back("invalid publicKey");
}
- result.appendArray(m_impl->extensions.verify());
+ appendArray(result, m_impl->extensions.verify());
LOGIT_DEBUG_STRINGARRAY("CertificateData::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
RequestData::dump() const
{
- StringArray result;
- result.append("RequestData::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("RequestData::dump()");
- result.append("Version = " + String(m_impl->version));
- result.appendArray(m_impl->subject.dump());
- result.append("Keysize = " + String(m_impl->keysize));
- result.append("pubkeyAlgorithm = " + String(m_impl->pubkeyAlgorithm));
+ result.push_back("Version = " + String(m_impl->version));
+ appendArray(result, m_impl->subject.dump());
+ result.push_back("Keysize = " + String(m_impl->keysize));
+ result.push_back("pubkeyAlgorithm = " + String(m_impl->pubkeyAlgorithm));
String pk;
for(size_t i = 0; i < m_impl->publicKey.size(); ++i)
@@ -213,9 +213,9 @@
s.format("%02x", static_cast<UInt8>(m_impl->publicKey[i]));
pk += s + ":";
}
- result.append("public Key = " + pk);
+ result.push_back("public Key = " + pk);
- result.append("signatureAlgorithm = "+ String(m_impl->signatureAlgorithm));
+ result.push_back("signatureAlgorithm = "+ String(m_impl->signatureAlgorithm));
String s;
for(uint i = 0; i < m_impl->signature.size(); ++i)
@@ -225,11 +225,11 @@
s += d;
}
- result.append("Signature = " + s);
+ result.push_back("Signature = " + s);
- result.appendArray(m_impl->extensions.dump());
- result.append("Challenge Password = " + m_impl->challengePassword);
- result.append("Unstructured Name = " + m_impl->unstructuredName);
+ appendArray(result, m_impl->extensions.dump());
+ result.push_back("Challenge Password = " + m_impl->challengePassword);
+ result.push_back("Unstructured Name = " + m_impl->unstructuredName);
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp Sat Jun 12 14:33:19 2010
@@ -91,7 +91,7 @@
void
RequestData_Priv::setSubjectDN(const DNObject dn)
{
- StringArray r = dn.verify();
+ std::vectorblocxx::String r = dn.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -127,7 +127,7 @@
void
RequestData_Priv::setExtensions(const X509v3RequestExts &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp Sat Jun 12 14:33:19 2010
@@ -133,7 +133,7 @@
void
RequestGenerationData::setSubjectDN(const DNObject dn)
{
- StringArray r = dn.verify();
+ std::vectorblocxx::String r = dn.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -205,7 +205,7 @@
void
RequestGenerationData::setExtensions(const X509v3RequestExts &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -276,34 +276,34 @@
return m_impl->extensions.valid();
}
-blocxx::StringArray
+std::vectorblocxx::String
RequestGenerationData::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
- result.appendArray(m_impl->subject.verify());
+ appendArray(result, m_impl->subject.verify());
// keysize??
- result.appendArray(m_impl->extensions.verify());
+ appendArray(result, m_impl->extensions.verify());
LOGIT_DEBUG_STRINGARRAY("RequestGenerationData::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
RequestGenerationData::dump() const
{
- StringArray result;
- result.append("RequestGenerationData::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("RequestGenerationData::dump()");
- result.appendArray(m_impl->subject.dump());
- result.append("Keysize = " + String(m_impl->keysize));
- result.append("MessageDigest = " + String(m_impl->messageDigest));
- result.append("Challenge Password = " + m_impl->challengePassword);
- result.append("Unstructured Name = " + m_impl->unstructuredName);
- result.appendArray(m_impl->extensions.dump());
+ appendArray(result, m_impl->subject.dump());
+ result.push_back("Keysize = " + String(m_impl->keysize));
+ result.push_back("MessageDigest = " + String(m_impl->messageDigest));
+ result.push_back("Challenge Password = " + m_impl->challengePassword);
+ result.push_back("Unstructured Name = " + m_impl->unstructuredName);
+ appendArray(result, m_impl->extensions.dump());
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp Sat Jun 12 14:33:19 2010
@@ -123,8 +123,8 @@
bool p = caConfig->exists(type2Section(type, true), "nsBaseUrl");
if(p)
{
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "nsBaseUrl"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "nsBaseUrl")));
if(sp[0].equalsIgnoreCase("critical"))
{
setCritical(true);
@@ -225,31 +225,31 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
NsBaseUrlExt::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(!initURICheck().isValid(m_impl->value)) {
LOGIT_DEBUG("Wrong value for NsBaseUrlExt:" << m_impl->value);
- result.append(Format("Wrong value for NsBaseUrlExt: %1", m_impl->value).toString());
+ result.push_back(Format("Wrong value for NsBaseUrlExt: %1", m_impl->value).toString());
}
LOGIT_DEBUG_STRINGARRAY("NsBaseUrlExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
NsBaseUrlExt::dump() const
{
- StringArray result;
- result.append("NsBaseUrlExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("NsBaseUrlExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("URL = " + m_impl->value);
+ result.push_back("URL = " + m_impl->value);
return result;
}
@@ -287,8 +287,8 @@
bool p = caConfig->exists(type2Section(type, true), "nsRevocationUrl");
if(p) {
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "nsRevocationUrl"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "nsRevocationUrl")));
if(sp[0].equalsIgnoreCase("critical")) {
setCritical(true);
m_impl->value = sp[1];
@@ -367,16 +367,16 @@
}
}
-blocxx::StringArray
+std::vectorblocxx::String
NsRevocationUrlExt::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(!initURICheck().isValid(m_impl->value)) {
LOGIT_DEBUG("Wrong value for NsRevocationUrlExt:" << m_impl->value);
- result.append(Format("Wrong value for NsRevocationUrlExt: %1", m_impl->value).toString());
+ result.push_back(Format("Wrong value for NsRevocationUrlExt: %1", m_impl->value).toString());
}
LOGIT_DEBUG_STRINGARRAY("NsRevocationUrlExt::verify()", result);
return result;
@@ -394,16 +394,16 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
NsRevocationUrlExt::dump() const
{
- StringArray result;
- result.append("NsRevocationUrlExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("NsRevocationUrlExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("URL = " + m_impl->value);
+ result.push_back("URL = " + m_impl->value);
return result;
}
@@ -441,8 +441,8 @@
bool p = caConfig->exists(type2Section(type, true), "nsCaRevocationUrl");
if(p) {
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "nsCaRevocationUrl"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "nsCaRevocationUrl")));
if(sp[0].equalsIgnoreCase("critical")) {
setCritical(true);
m_impl->value = sp[1];
@@ -521,16 +521,16 @@
}
}
-blocxx::StringArray
+std::vectorblocxx::String
NsCaRevocationUrlExt::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(!initURICheck().isValid(m_impl->value)) {
LOGIT_DEBUG("Wrong value for NsCaRevocationUrlExt:" << m_impl->value);
- result.append(Format("Wrong value for NsCaRevocationUrlExt: %1", m_impl->value).toString());
+ result.push_back(Format("Wrong value for NsCaRevocationUrlExt: %1", m_impl->value).toString());
}
LOGIT_DEBUG_STRINGARRAY("NsCaRevocationUrlExt::verify()", result);
return result;
@@ -548,16 +548,16 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
NsCaRevocationUrlExt::dump() const
{
- StringArray result;
- result.append("NsCaRevocationUrlExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("NsCaRevocationUrlExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("URL = " + m_impl->value);
+ result.push_back("URL = " + m_impl->value);
return result;
}
@@ -594,8 +594,8 @@
bool p = caConfig->exists(type2Section(type, true), "nsRenewalUrl");
if(p) {
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "nsRenewalUrl"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "nsRenewalUrl")));
if(sp[0].equalsIgnoreCase("critical")) {
setCritical(true);
m_impl->value = sp[1];
@@ -674,16 +674,16 @@
}
}
-blocxx::StringArray
+std::vectorblocxx::String
NsRenewalUrlExt::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(!initURICheck().isValid(m_impl->value)) {
LOGIT_DEBUG("Wrong value for NsRenewalUrlExt:" << m_impl->value);
- result.append(Format("Wrong value for NsRenewalUrlExt: %1", m_impl->value).toString());
+ result.push_back(Format("Wrong value for NsRenewalUrlExt: %1", m_impl->value).toString());
}
LOGIT_DEBUG_STRINGARRAY("NsRenewalUrlExt::verify()", result);
return result;
@@ -701,16 +701,16 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
NsRenewalUrlExt::dump() const
{
- StringArray result;
- result.append("NsRenewalUrlExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("NsRenewalUrlExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("URL = " + m_impl->value);
+ result.push_back("URL = " + m_impl->value);
return result;
}
@@ -746,8 +746,8 @@
bool p = caConfig->exists(type2Section(type, true), "nsCaPolicyUrl");
if(p) {
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "nsCaPolicyUrl"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "nsCaPolicyUrl")));
if(sp[0].equalsIgnoreCase("critical")) {
setCritical(true);
m_impl->value = sp[1];
@@ -826,16 +826,16 @@
}
}
-blocxx::StringArray
+std::vectorblocxx::String
NsCaPolicyUrlExt::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(!initURICheck().isValid(m_impl->value)) {
LOGIT_DEBUG("Wrong value for NsCaPolicyUrlExt:" << m_impl->value);
- result.append(Format("Wrong value for NsCaPolicyUrlExt: %1", m_impl->value).toString());
+ result.push_back(Format("Wrong value for NsCaPolicyUrlExt: %1", m_impl->value).toString());
}
LOGIT_DEBUG_STRINGARRAY("NsCaPolicyUrlExt::verify()", result);
return result;
@@ -853,16 +853,16 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
NsCaPolicyUrlExt::dump() const
{
- StringArray result;
- result.append("NsCaPolicyUrlExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("NsCaPolicyUrlExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("URL = " + m_impl->value);
+ result.push_back("URL = " + m_impl->value);
return result;
}
@@ -894,8 +894,8 @@
bool p = caConfig->exists(type2Section(type, true), "nsSslServerName");
if(p) {
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "nsSslServerName"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "nsSslServerName")));
if(sp[0].equalsIgnoreCase("critical")) {
setCritical(true);
m_impl->value = sp[1];
@@ -968,10 +968,10 @@
}
}
-blocxx::StringArray
+std::vectorblocxx::String
NsSslServerNameExt::verify() const
{
- return blocxx::StringArray();
+ return std::vectorblocxx::String();
}
bool
@@ -980,16 +980,16 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
NsSslServerNameExt::dump() const
{
- StringArray result;
- result.append("NsSslServerNameExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("NsSslServerNameExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("SSL server name = " + m_impl->value);
+ result.push_back("SSL server name = " + m_impl->value);
return result;
}
@@ -1020,8 +1020,8 @@
bool p = caConfig->exists(type2Section(type, true), "nsComment");
if(p) {
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "nsComment"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "nsComment")));
if(sp[0].equalsIgnoreCase("critical")) {
setCritical(true);
m_impl->value = sp[1];
@@ -1094,10 +1094,10 @@
}
}
-blocxx::StringArray
+std::vectorblocxx::String
NsCommentExt::verify() const
{
- return blocxx::StringArray();
+ return std::vectorblocxx::String();
}
bool
@@ -1106,16 +1106,16 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
NsCommentExt::dump() const
{
- StringArray result;
- result.append("NsCommentExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("NsCommentExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("NS Comment = " + m_impl->value);
+ result.push_back("NS Comment = " + m_impl->value);
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp Sat Jun 12 14:33:19 2010
@@ -86,12 +86,12 @@
bool p = caConfig->exists(type2Section(type, true), "subjectAltName");
if(p)
{
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "subjectAltName"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "subjectAltName")));
if(sp[0].equalsIgnoreCase("critical")) setCritical(true);
- StringArray::const_iterator it = sp.begin();
+ std::vectorblocxx::String::const_iterator it = sp.begin();
for(; it != sp.end(); ++it)
{
if((*it).indexOf(":") != String::npos)
@@ -121,7 +121,7 @@
: ExtensionBase()
, m_impl(new SubjectAlternativeNameExtImpl(copyEmail, alternativeNameList))
{
- StringArray r = checkLiteralValueList(alternativeNameList);
+ std::vectorblocxx::String r = checkLiteralValueList(alternativeNameList);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -162,7 +162,7 @@
void
SubjectAlternativeNameExt::setAlternativeNameList(const std::list<LiteralValue> &alternativeNameList)
{
- StringArray r = checkLiteralValueList(alternativeNameList);
+ std::vectorblocxx::String r = checkLiteralValueList(alternativeNameList);
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -250,7 +250,7 @@
LOGIT_DEBUG("return SubjectAlternativeNameExt::::valid() is false");
return false;
}
- StringArray r = checkLiteralValueList(m_impl->altNameList);
+ std::vectorblocxx::String r = checkLiteralValueList(m_impl->altNameList);
if(!r.empty())
{
LOGIT_DEBUG(r[0]);
@@ -259,39 +259,39 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
SubjectAlternativeNameExt::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(!m_impl->emailCopy && m_impl->altNameList.empty())
{
- result.append(String("invalid value for SubjectAlternativeNameExt"));
+ result.push_back(String("invalid value for SubjectAlternativeNameExt"));
}
- result.appendArray(checkLiteralValueList(m_impl->altNameList));
+ appendArray(result, checkLiteralValueList(m_impl->altNameList));
LOGIT_DEBUG_STRINGARRAY("SubjectAlternativeNameExt::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
SubjectAlternativeNameExt::dump() const
{
- StringArray result;
- result.append("SubjectAlternativeNameExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("SubjectAlternativeNameExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("email:copy = " + Bool(m_impl->emailCopy).toString());
+ result.push_back("email:copy = " + Bool(m_impl->emailCopy).toString());
std::list< LiteralValue >::const_iterator it = m_impl->altNameList.begin();
for(; it != m_impl->altNameList.end(); ++it)
{
- result.appendArray((*it).dump());
+ appendArray(result, (*it).dump());
}
return result;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp Sat Jun 12 14:33:19 2010
@@ -88,8 +88,8 @@
{
String str;
- StringArray sp = PerlRegEx("\\s*,\\s*")
- .split(caConfig->getValue(type2Section(type, true), "subjectKeyIdentifier"));
+ std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*")
+ .split(caConfig->getValue(type2Section(type, true), "subjectKeyIdentifier")));
if(sp[0].equalsIgnoreCase("critical"))
{
@@ -256,16 +256,16 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
SubjectKeyIdentifierExt::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
if(!isPresent()) return result;
if(!m_impl->autodetect && m_impl->keyid.empty())
{
- result.append(String("Wrong value for SubjectKeyIdentifierExt: ") +
+ result.push_back(String("Wrong value for SubjectKeyIdentifierExt: ") +
Format("autodetect(%1), keyId(%2)",
m_impl->autodetect?"true":"false",
m_impl->keyid.c_str()).toString());
@@ -273,7 +273,7 @@
if(m_impl->autodetect && !m_impl->keyid.empty())
{
- result.append(String("Wrong value for SubjectKeyIdentifierExt: ") +
+ result.push_back(String("Wrong value for SubjectKeyIdentifierExt: ") +
Format("autodetect(%1), keyId(%2)",
m_impl->autodetect?"true":"false",
m_impl->keyid.c_str()).toString());
@@ -283,7 +283,7 @@
ValueCheck check = initHexCheck();
if(!check.isValid(m_impl->keyid))
{
- result.append(Format("Wrong keyID in SubjectKeyIdentifierExt: %1",
+ result.push_back(Format("Wrong keyID in SubjectKeyIdentifierExt: %1",
m_impl->keyid.c_str()).toString());
}
}
@@ -291,17 +291,17 @@
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
SubjectKeyIdentifierExt::dump() const
{
- StringArray result;
- result.append("SubjectKeyIdentifierExt::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("SubjectKeyIdentifierExt::dump()");
- result.appendArray(ExtensionBase::dump());
+ appendArray(result, ExtensionBase::dump());
if(!isPresent()) return result;
- result.append("Autodetect = " + Bool(m_impl->autodetect).toString());
- result.append("KeyID = " + m_impl->keyid);
+ result.push_back("Autodetect = " + Bool(m_impl->autodetect).toString());
+ result.push_back("KeyID = " + m_impl->keyid);
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp Sat Jun 12 14:33:19 2010
@@ -135,7 +135,7 @@
// -----------------------------------------------------------------
-blocxx::StringArray
+std::vectorblocxx::String
Url::getKnownSchemes() const
{
return m_impl->getKnownSchemes();
@@ -282,7 +282,7 @@
// -----------------------------------------------------------------
-blocxx::StringArray
+std::vectorblocxx::String
Url::getPathParamsArray() const
{
return m_impl->getPathParamsArray();
@@ -306,7 +306,7 @@
// -----------------------------------------------------------------
-blocxx::StringArray
+std::vectorblocxx::String
Url::getQueryStringArray() const
{
return m_impl->getQueryStringArray();
@@ -438,7 +438,7 @@
// -----------------------------------------------------------------
void
-Url::setPathParamsArray(const blocxx::StringArray &parray)
+Url::setPathParamsArray(const std::vectorblocxx::String &parray)
{
m_impl->setPathParamsArray(parray);
}
@@ -462,7 +462,7 @@
// -----------------------------------------------------------------
void
-Url::setQueryStringArray(const blocxx::StringArray &qarray)
+Url::setQueryStringArray(const std::vectorblocxx::String &qarray)
{
m_impl->setQueryStringArray(qarray);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp Sat Jun 12 14:33:19 2010
@@ -396,10 +396,10 @@
// -------------------------------------------------------------------
-blocxx::StringArray
+std::vectorblocxx::String
UrlBase::getKnownSchemes() const
{
- return blocxx::StringArray();
+ return std::vectorblocxx::String();
}
@@ -408,8 +408,8 @@
UrlBase::isKnownScheme(const blocxx::String &scheme) const
{
String lscheme( String(scheme).toLowerCase());
- StringArray schemes( getKnownSchemes());
- StringArray::const_iterator s;
+ std::vectorblocxx::String schemes( getKnownSchemes());
+ std::vectorblocxx::String::const_iterator s;
for(s=schemes.begin(); s!=schemes.end(); ++s)
{
@@ -436,12 +436,12 @@
if(valid)
{
String lscheme( String(scheme).toLowerCase());
- StringArray schemes( getKnownSchemes());
+ std::vectorblocxx::String schemes( getKnownSchemes());
if( schemes.empty())
return true;
- StringArray::const_iterator s;
+ std::vectorblocxx::String::const_iterator s;
for(s=schemes.begin(); s!=schemes.end(); ++s)
{
if( lscheme == String(*s).toLowerCase())
@@ -752,12 +752,12 @@
// -------------------------------------------------------------------
-blocxx::StringArray
+std::vectorblocxx::String
UrlBase::getPathParamsArray() const
{
if( config("psep_pathparam").empty())
{
- return blocxx::StringArray(1, getPathParams());
+ return std::vectorblocxx::String(1, getPathParams());
}
else
{
@@ -801,12 +801,12 @@
// -------------------------------------------------------------------
-blocxx::StringArray
+std::vectorblocxx::String
UrlBase::getQueryStringArray() const
{
if( config("psep_querystr").empty())
{
- return blocxx::StringArray(1, getQueryString());
+ return std::vectorblocxx::String(1, getQueryString());
}
else
{
@@ -1171,7 +1171,7 @@
// -------------------------------------------------------------------
void
-UrlBase::setPathParamsArray(const blocxx::StringArray &parray)
+UrlBase::setPathParamsArray(const std::vectorblocxx::String &parray)
{
setPathParams(
ca_mgm::url::join(
@@ -1216,7 +1216,7 @@
// -------------------------------------------------------------------
void
-UrlBase::setQueryStringArray(const blocxx::StringArray &qarray)
+UrlBase::setQueryStringArray(const std::vectorblocxx::String &qarray)
{
setQueryString(
ca_mgm::url::join(
Modified: limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.hpp Sat Jun 12 14:33:19 2010
@@ -42,7 +42,7 @@
// -------------------------------------------------------------------
#if 0
-blocxx::StringArray
+std::vectorblocxx::String
getUrlBySchemeNames();
#endif
Modified: limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp Sat Jun 12 14:33:19 2010
@@ -250,7 +250,7 @@
// -------------------------------------------------------------------
-blocxx::StringArray
+std::vectorblocxx::String
split(const blocxx::String &pstr,
const blocxx::String &psep)
{
@@ -261,7 +261,7 @@
);
}
- StringArray params;
+ std::vectorblocxx::String params;
size_t beg, pos, len;
len = pstr.length();
@@ -299,8 +299,8 @@
);
}
- StringArray params( split(str, psep));
- StringArray::const_iterator piter;
+ std::vectorblocxx::String params( split(str, psep));
+ std::vectorblocxx::String::const_iterator piter;
blocxx::String key, val;
size_t pos;
ParamMap pmap;
@@ -341,11 +341,11 @@
// -------------------------------------------------------------------
blocxx::String
-join(const blocxx::StringArray ¶ms,
+join(const std::vectorblocxx::String ¶ms,
const blocxx::String &psep)
{
blocxx::String str;
- blocxx::StringArray::const_iterator p( params.begin());
+ std::vectorblocxx::String::const_iterator p( params.begin());
if( p != params.end())
{
@@ -407,11 +407,11 @@
UrlComponents
parse_url_string(const blocxx::String &url)
{
- StringArray cap;
+ std::vectorblocxx::String cap;
try
{
blocxx::PosixRegEx reg(RX_SPLIT_URL);
- cap = reg.capture(url);
+ cap = convStringArray(reg.capture(url));
}
catch(...)
{}
@@ -455,11 +455,11 @@
UrlAuthority
parse_url_authority(const blocxx::String &authority)
{
- StringArray cap;
+ std::vectorblocxx::String cap;
try
{
blocxx::PosixRegEx reg(RX_SPLIT_URL_AUTHORITY);
- cap = reg.capture(authority);
+ cap = convStringArray(reg.capture(authority));
}
catch(...)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp Sat Jun 12 14:33:19 2010
@@ -68,7 +68,7 @@
// -------------------------------------------------------------------
int wrapExecuteProcessAndGatherOutput(
- const blocxx::Arrayblocxx::String &cmd,
+ const std::vectorblocxx::String &cmd,
blocxx::String &out,
blocxx::String &err,
const blocxx::EnvVars &env,
@@ -83,7 +83,8 @@
blocxx::Process::Status status;
status = blocxx::Exec::executeProcessAndGatherOutput(
- cmd, out, err, env,
+ blocxx::StringArray(cmd.begin(), cmd.end()),
+ out, err, env,
( tmax < 0 ? blocxx::Timeout::infinite :
blocxx::Timeout::relative(float(tmax))
),
@@ -147,6 +148,19 @@
return exitStatus;
}
+std::vectorblocxx::String
+convStringArray(const blocxx::StringArray &in)
+{
+ std::vectorblocxx::String out(in.begin(), in.end());
+ return out;
+}
+
+void
+appendArray(std::vectorblocxx::String &in, const std::vectorblocxx::String &arr)
+{
+ in.insert(in.end(), arr.begin(), arr.end());
+}
+
// -------------------------------------------------------------------
} // End of CA_MGM_NAMESPACE
// vim: set ts=8 sts=8 sw=8 ai noet:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp Sat Jun 12 14:33:19 2010
@@ -157,14 +157,14 @@
.Or(new ValuePosixRECheck("^([0-9a-fA-F]{1,4}:){1,6}:$"))
.Or(
ValueCheck(
- ValueCheck( new ValuePosixRECheck( "^(([0-9a-fA-F]{1,4}):){1,6}(:([0-9a-fA-F]{1,4})){1,6}$"))
+ ValueCheck( new ValuePosixRECheck( "^(([0-9a-fA-F]{1,4}):){1,6}(:([0-9a-fA-F]{1,4})){1,6}$"))
).And(
ValueCheck( new ValuePosixRECheck("^([^:]*:){8,}")).Not()
).And(
ValueCheck( new ValuePosixRECheck("::.*::") ).Not()
)
);
-
+
return checkIP;
}
@@ -176,13 +176,15 @@
return checkAccessOID;
}
-inline blocxx::StringArray
+inline std::vectorblocxx::String
checkLiteralValueList(const std::list<LiteralValue>& list)
{
- blocxx::StringArray result;
+ std::vectorblocxx::String result;
std::list<LiteralValue>::const_iterator it = list.begin();
for(;it != list.end(); it++) {
- result.appendArray((*it).verify());
+ //result.appendArray((*it).verify());
+ std::vectorblocxx::String v = (*it).verify();
+ result.insert(result.end(), v.begin(), v.end());
}
return result;
}
@@ -245,7 +247,7 @@
// throws or returns the process exit code or -1 (term by signal).
int wrapExecuteProcessAndGatherOutput(
- const blocxx::Arrayblocxx::String &cmd,
+ const std::vectorblocxx::String &cmd,
blocxx::String &out,
blocxx::String &err,
const blocxx::EnvVars &env,
@@ -256,7 +258,7 @@
inline int rehashCAs(const blocxx::String &repositoryDir)
{
- blocxx::Arrayblocxx::String cmd;
+ std::vectorblocxx::String cmd;
cmd.push_back(C_REHASH_COMMAND);
cmd.push_back(repositoryDir);
@@ -293,6 +295,10 @@
return status;
}
+std::vectorblocxx::String convStringArray(const blocxx::StringArray &in);
+void appendArray(std::vectorblocxx::String &in, const std::vectorblocxx::String &arr);
+
+
}
// -------------------------------------------------------------------
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions.cpp Sat Jun 12 14:33:19 2010
@@ -69,26 +69,26 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
X509v3CRLExts::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
- result.appendArray(m_impl->authorityKeyIdentifier.verify());
- result.appendArray(m_impl->issuerAlternativeName.verify());
+ appendArray(result, m_impl->authorityKeyIdentifier.verify());
+ appendArray(result, m_impl->issuerAlternativeName.verify());
LOGIT_DEBUG_STRINGARRAY("X509v3CRLExts::verify()", result);
return result;;
}
-blocxx::StringArray
+std::vectorblocxx::String
X509v3CRLExts::dump() const
{
- StringArray result;
- result.append("X509v3CRLExts::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("X509v3CRLExts::dump()");
- result.appendArray(m_impl->authorityKeyIdentifier.dump());
- result.appendArray(m_impl->issuerAlternativeName.dump());
+ appendArray(result, m_impl->authorityKeyIdentifier.dump());
+ appendArray(result, m_impl->issuerAlternativeName.dump());
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp Sat Jun 12 14:33:19 2010
@@ -71,7 +71,7 @@
void
X509v3CRLExts_Priv::setAuthorityKeyIdentifier(const AuthorityKeyIdentifierExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -83,7 +83,7 @@
void
X509v3CRLExts_Priv::setIssuerAlternativeName(const IssuerAlternativeNameExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp Sat Jun 12 14:33:19 2010
@@ -159,26 +159,26 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
X509v3CRLGenerationExts::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
- result.appendArray(m_impl->authorityKeyIdentifier.verify());
- result.appendArray(m_impl->issuerAlternativeName.verify());
+ appendArray(result, m_impl->authorityKeyIdentifier.verify());
+ appendArray(result, m_impl->issuerAlternativeName.verify());
LOGIT_DEBUG_STRINGARRAY("X509v3CRLGenerationExts::verify()", result);
return result;;
}
-blocxx::StringArray
+std::vectorblocxx::String
X509v3CRLGenerationExts::dump() const
{
- StringArray result;
- result.append("X509v3CRLGenerationExts::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("X509v3CRLGenerationExts::dump()");
- result.appendArray(m_impl->authorityKeyIdentifier.dump());
- result.appendArray(m_impl->issuerAlternativeName.dump());
+ appendArray(result, m_impl->authorityKeyIdentifier.dump());
+ appendArray(result, m_impl->issuerAlternativeName.dump());
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions.cpp Sat Jun 12 14:33:19 2010
@@ -181,58 +181,58 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
X509v3CertificateExts::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
- result.appendArray(m_impl->nsBaseUrl.verify());
- result.appendArray(m_impl->nsRevocationUrl.verify());
- result.appendArray(m_impl->nsCaRevocationUrl.verify());
- result.appendArray(m_impl->nsRenewalUrl.verify());
- result.appendArray(m_impl->nsCaPolicyUrl.verify());
- result.appendArray(m_impl->nsSslServerName.verify());
- result.appendArray(m_impl->nsComment.verify());
- result.appendArray(m_impl->keyUsage.verify());
- result.appendArray(m_impl->nsCertType.verify());
- result.appendArray(m_impl->basicConstraints.verify());
- result.appendArray(m_impl->extendedKeyUsage.verify());
- result.appendArray(m_impl->subjectKeyIdentifier.verify());
- result.appendArray(m_impl->authorityKeyIdentifier.verify());
- result.appendArray(m_impl->subjectAlternativeName.verify());
- result.appendArray(m_impl->issuerAlternativeName.verify());
- result.appendArray(m_impl->authorityInfoAccess.verify());
- result.appendArray(m_impl->crlDistributionPoints.verify());
- result.appendArray(m_impl->certificatePolicies.verify());
+ appendArray(result, m_impl->nsBaseUrl.verify());
+ appendArray(result, m_impl->nsRevocationUrl.verify());
+ appendArray(result, m_impl->nsCaRevocationUrl.verify());
+ appendArray(result, m_impl->nsRenewalUrl.verify());
+ appendArray(result, m_impl->nsCaPolicyUrl.verify());
+ appendArray(result, m_impl->nsSslServerName.verify());
+ appendArray(result, m_impl->nsComment.verify());
+ appendArray(result, m_impl->keyUsage.verify());
+ appendArray(result, m_impl->nsCertType.verify());
+ appendArray(result, m_impl->basicConstraints.verify());
+ appendArray(result, m_impl->extendedKeyUsage.verify());
+ appendArray(result, m_impl->subjectKeyIdentifier.verify());
+ appendArray(result, m_impl->authorityKeyIdentifier.verify());
+ appendArray(result, m_impl->subjectAlternativeName.verify());
+ appendArray(result, m_impl->issuerAlternativeName.verify());
+ appendArray(result, m_impl->authorityInfoAccess.verify());
+ appendArray(result, m_impl->crlDistributionPoints.verify());
+ appendArray(result, m_impl->certificatePolicies.verify());
LOGIT_DEBUG_STRINGARRAY("X509v3CertificateExts::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
X509v3CertificateExts::dump() const
{
- StringArray result;
- result.append("X509v3CertificateExts::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("X509v3CertificateExts::dump()");
- result.appendArray(m_impl->nsBaseUrl.dump());
- result.appendArray(m_impl->nsRevocationUrl.dump());
- result.appendArray(m_impl->nsCaRevocationUrl.dump());
- result.appendArray(m_impl->nsRenewalUrl.dump());
- result.appendArray(m_impl->nsCaPolicyUrl.dump());
- result.appendArray(m_impl->nsSslServerName.dump());
- result.appendArray(m_impl->nsComment.dump());
- result.appendArray(m_impl->keyUsage.dump());
- result.appendArray(m_impl->nsCertType.dump());
- result.appendArray(m_impl->basicConstraints.dump());
- result.appendArray(m_impl->extendedKeyUsage.dump());
- result.appendArray(m_impl->subjectKeyIdentifier.dump());
- result.appendArray(m_impl->authorityKeyIdentifier.dump());
- result.appendArray(m_impl->subjectAlternativeName.dump());
- result.appendArray(m_impl->issuerAlternativeName.dump());
- result.appendArray(m_impl->authorityInfoAccess.dump());
- result.appendArray(m_impl->crlDistributionPoints.dump());
- result.appendArray(m_impl->certificatePolicies.dump());
+ appendArray(result, m_impl->nsBaseUrl.dump());
+ appendArray(result, m_impl->nsRevocationUrl.dump());
+ appendArray(result, m_impl->nsCaRevocationUrl.dump());
+ appendArray(result, m_impl->nsRenewalUrl.dump());
+ appendArray(result, m_impl->nsCaPolicyUrl.dump());
+ appendArray(result, m_impl->nsSslServerName.dump());
+ appendArray(result, m_impl->nsComment.dump());
+ appendArray(result, m_impl->keyUsage.dump());
+ appendArray(result, m_impl->nsCertType.dump());
+ appendArray(result, m_impl->basicConstraints.dump());
+ appendArray(result, m_impl->extendedKeyUsage.dump());
+ appendArray(result, m_impl->subjectKeyIdentifier.dump());
+ appendArray(result, m_impl->authorityKeyIdentifier.dump());
+ appendArray(result, m_impl->subjectAlternativeName.dump());
+ appendArray(result, m_impl->issuerAlternativeName.dump());
+ appendArray(result, m_impl->authorityInfoAccess.dump());
+ appendArray(result, m_impl->crlDistributionPoints.dump());
+ appendArray(result, m_impl->certificatePolicies.dump());
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp Sat Jun 12 14:33:19 2010
@@ -141,7 +141,7 @@
void
X509v3CertificateExts_Priv::setNsBaseUrl(const NsBaseUrlExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -153,7 +153,7 @@
void
X509v3CertificateExts_Priv::setNsRevocationUrl(const NsRevocationUrlExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -165,7 +165,7 @@
void
X509v3CertificateExts_Priv::setNsCaRevocationUrl(const NsCaRevocationUrlExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -177,7 +177,7 @@
void
X509v3CertificateExts_Priv::setNsRenewalUrl(const NsRenewalUrlExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -189,7 +189,7 @@
void
X509v3CertificateExts_Priv::setNsCaPolicyUrl(const NsCaPolicyUrlExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -201,7 +201,7 @@
void
X509v3CertificateExts_Priv::setNsSslServerName(const NsSslServerNameExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -213,7 +213,7 @@
void
X509v3CertificateExts_Priv::setNsComment(const NsCommentExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -225,7 +225,7 @@
void
X509v3CertificateExts_Priv::setNsCertType(const NsCertTypeExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -237,7 +237,7 @@
void
X509v3CertificateExts_Priv::setKeyUsage(const KeyUsageExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -249,7 +249,7 @@
void
X509v3CertificateExts_Priv::setBasicConstraints(const BasicConstraintsExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -261,7 +261,7 @@
void
X509v3CertificateExts_Priv::setExtendedKeyUsage(const ExtendedKeyUsageExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -273,7 +273,7 @@
void
X509v3CertificateExts_Priv::setSubjectKeyIdentifier(const SubjectKeyIdentifierExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -285,7 +285,7 @@
void
X509v3CertificateExts_Priv::setAuthorityKeyIdentifier(const AuthorityKeyIdentifierExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -297,7 +297,7 @@
void
X509v3CertificateExts_Priv::setSubjectAlternativeName(const SubjectAlternativeNameExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -309,7 +309,7 @@
void
X509v3CertificateExts_Priv::setIssuerAlternativeName(const IssuerAlternativeNameExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -321,7 +321,7 @@
void
X509v3CertificateExts_Priv::setAuthorityInfoAccess(const AuthorityInfoAccessExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -333,7 +333,7 @@
void
X509v3CertificateExts_Priv::setCRLDistributionPoints(const CRLDistributionPointsExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
@@ -345,7 +345,7 @@
void
X509v3CertificateExts_Priv::setCertificatePolicies(const CertificatePoliciesExt &ext)
{
- StringArray r = ext.verify();
+ std::vectorblocxx::String r = ext.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp Sat Jun 12 14:33:19 2010
@@ -631,58 +631,58 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
X509v3CertificateIssueExts::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
- result.appendArray(m_impl->nsBaseUrl.verify());
- result.appendArray(m_impl->nsRevocationUrl.verify());
- result.appendArray(m_impl->nsCaRevocationUrl.verify());
- result.appendArray(m_impl->nsRenewalUrl.verify());
- result.appendArray(m_impl->nsCaPolicyUrl.verify());
- result.appendArray(m_impl->nsSslServerName.verify());
- result.appendArray(m_impl->nsComment.verify());
- result.appendArray(m_impl->keyUsage.verify());
- result.appendArray(m_impl->nsCertType.verify());
- result.appendArray(m_impl->basicConstraints.verify());
- result.appendArray(m_impl->extendedKeyUsage.verify());
- result.appendArray(m_impl->subjectKeyIdentifier.verify());
- result.appendArray(m_impl->authorityKeyIdentifier.verify());
- result.appendArray(m_impl->subjectAlternativeName.verify());
- result.appendArray(m_impl->issuerAlternativeName.verify());
- result.appendArray(m_impl->authorityInfoAccess.verify());
- result.appendArray(m_impl->crlDistributionPoints.verify());
- result.appendArray(m_impl->certificatePolicies.verify());
+ appendArray(result, m_impl->nsBaseUrl.verify());
+ appendArray(result, m_impl->nsRevocationUrl.verify());
+ appendArray(result, m_impl->nsCaRevocationUrl.verify());
+ appendArray(result, m_impl->nsRenewalUrl.verify());
+ appendArray(result, m_impl->nsCaPolicyUrl.verify());
+ appendArray(result, m_impl->nsSslServerName.verify());
+ appendArray(result, m_impl->nsComment.verify());
+ appendArray(result, m_impl->keyUsage.verify());
+ appendArray(result, m_impl->nsCertType.verify());
+ appendArray(result, m_impl->basicConstraints.verify());
+ appendArray(result, m_impl->extendedKeyUsage.verify());
+ appendArray(result, m_impl->subjectKeyIdentifier.verify());
+ appendArray(result, m_impl->authorityKeyIdentifier.verify());
+ appendArray(result, m_impl->subjectAlternativeName.verify());
+ appendArray(result, m_impl->issuerAlternativeName.verify());
+ appendArray(result, m_impl->authorityInfoAccess.verify());
+ appendArray(result, m_impl->crlDistributionPoints.verify());
+ appendArray(result, m_impl->certificatePolicies.verify());
LOGIT_DEBUG_STRINGARRAY("X509v3CertificateIssueExts::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
X509v3CertificateIssueExts::dump() const
{
- StringArray result;
- result.append("X509v3CertificateIssueExts::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("X509v3CertificateIssueExts::dump()");
- result.appendArray(m_impl->nsBaseUrl.dump());
- result.appendArray(m_impl->nsRevocationUrl.dump());
- result.appendArray(m_impl->nsCaRevocationUrl.dump());
- result.appendArray(m_impl->nsRenewalUrl.dump());
- result.appendArray(m_impl->nsCaPolicyUrl.dump());
- result.appendArray(m_impl->nsSslServerName.dump());
- result.appendArray(m_impl->nsComment.dump());
- result.appendArray(m_impl->keyUsage.dump());
- result.appendArray(m_impl->nsCertType.dump());
- result.appendArray(m_impl->basicConstraints.dump());
- result.appendArray(m_impl->extendedKeyUsage.dump());
- result.appendArray(m_impl->subjectKeyIdentifier.dump());
- result.appendArray(m_impl->authorityKeyIdentifier.dump());
- result.appendArray(m_impl->subjectAlternativeName.dump());
- result.appendArray(m_impl->issuerAlternativeName.dump());
- result.appendArray(m_impl->authorityInfoAccess.dump());
- result.appendArray(m_impl->crlDistributionPoints.dump());
- result.appendArray(m_impl->certificatePolicies.dump());
+ appendArray(result, m_impl->nsBaseUrl.dump());
+ appendArray(result, m_impl->nsRevocationUrl.dump());
+ appendArray(result, m_impl->nsCaRevocationUrl.dump());
+ appendArray(result, m_impl->nsRenewalUrl.dump());
+ appendArray(result, m_impl->nsCaPolicyUrl.dump());
+ appendArray(result, m_impl->nsSslServerName.dump());
+ appendArray(result, m_impl->nsComment.dump());
+ appendArray(result, m_impl->keyUsage.dump());
+ appendArray(result, m_impl->nsCertType.dump());
+ appendArray(result, m_impl->basicConstraints.dump());
+ appendArray(result, m_impl->extendedKeyUsage.dump());
+ appendArray(result, m_impl->subjectKeyIdentifier.dump());
+ appendArray(result, m_impl->authorityKeyIdentifier.dump());
+ appendArray(result, m_impl->subjectAlternativeName.dump());
+ appendArray(result, m_impl->issuerAlternativeName.dump());
+ appendArray(result, m_impl->authorityInfoAccess.dump());
+ appendArray(result, m_impl->crlDistributionPoints.dump());
+ appendArray(result, m_impl->certificatePolicies.dump());
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp Sat Jun 12 14:33:19 2010
@@ -276,38 +276,38 @@
return true;
}
-blocxx::StringArray
+std::vectorblocxx::String
X509v3RequestExts::verify() const
{
- StringArray result;
+ std::vectorblocxx::String result;
- result.appendArray(m_impl->nsSslServerName.verify());
- result.appendArray(m_impl->nsComment.verify());
- result.appendArray(m_impl->keyUsage.verify());
- result.appendArray(m_impl->nsCertType.verify());
- result.appendArray(m_impl->basicConstraints.verify());
- result.appendArray(m_impl->extendedKeyUsage.verify());
- result.appendArray(m_impl->subjectKeyIdentifier.verify());
- result.appendArray(m_impl->subjectAlternativeName.verify());
+ appendArray(result, m_impl->nsSslServerName.verify());
+ appendArray(result, m_impl->nsComment.verify());
+ appendArray(result, m_impl->keyUsage.verify());
+ appendArray(result, m_impl->nsCertType.verify());
+ appendArray(result, m_impl->basicConstraints.verify());
+ appendArray(result, m_impl->extendedKeyUsage.verify());
+ appendArray(result, m_impl->subjectKeyIdentifier.verify());
+ appendArray(result, m_impl->subjectAlternativeName.verify());
LOGIT_DEBUG_STRINGARRAY("X509v3RequestExts::verify()", result);
return result;
}
-blocxx::StringArray
+std::vectorblocxx::String
X509v3RequestExts::dump() const
{
- StringArray result;
- result.append("X509v3RequestExts::dump()");
+ std::vectorblocxx::String result;
+ result.push_back("X509v3RequestExts::dump()");
- result.appendArray(m_impl->nsSslServerName.dump());
- result.appendArray(m_impl->nsComment.dump());
- result.appendArray(m_impl->keyUsage.dump());
- result.appendArray(m_impl->nsCertType.dump());
- result.appendArray(m_impl->basicConstraints.dump());
- result.appendArray(m_impl->extendedKeyUsage.dump());
- result.appendArray(m_impl->subjectKeyIdentifier.dump());
- result.appendArray(m_impl->subjectAlternativeName.dump());
+ appendArray(result, m_impl->nsSslServerName.dump());
+ appendArray(result, m_impl->nsComment.dump());
+ appendArray(result, m_impl->keyUsage.dump());
+ appendArray(result, m_impl->nsCertType.dump());
+ appendArray(result, m_impl->basicConstraints.dump());
+ appendArray(result, m_impl->extendedKeyUsage.dump());
+ appendArray(result, m_impl->subjectKeyIdentifier.dump());
+ appendArray(result, m_impl->subjectAlternativeName.dump());
return result;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/Logger.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/Logger.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/Logger.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/Logger.hpp Sat Jun 12 14:33:19 2010
@@ -191,7 +191,7 @@
* create standard logger types (file, cerr, syslog), to set them as the
* global/default or per thread logger in the blocxx library as well as
* to retrieve them.
- *
+ *
* Each instance of the LiMaL logger contains a optional local component
* name, that is passed with every log message to the current logger and
* used instead of the default component name, that is set in the logger.
@@ -213,7 +213,7 @@
* @li @c %%d The date. May be followed by a date format specifier enclosed
* between braces. Examples:
* @code
- * "%d{%H:%M:%S}"
+ * "%d{%H:%M:%S}"
* "%d{%d %b %Y %H:%M:%S}"
* @endcode
* If no date format specifier is given then ISO8601 format is
@@ -295,10 +295,10 @@
* passed to the setDefaultLogger() or setThreadLogger() methods.
*
* @code
- * blocxx::Arrayblocxx::String components;
+ * std::vectorblocxx::String components;
* components.push_back("*");
*
- * blocxx::Arrayblocxx::String categories;
+ * std::vectorblocxx::String categories;
* categories.push_back("*");
*
* blocxx::LoggerRef l = ca_mgm::Logger::createCerrLogger(
@@ -321,8 +321,8 @@
*/
static blocxx::LoggerRef createCerrLogger(
const blocxx::String &component,
- const blocxx::Arrayblocxx::String &components,
- const blocxx::Arrayblocxx::String &categories,
+ const blocxx::StringArray &components,
+ const blocxx::StringArray &categories,
const blocxx::String &messageFormat
);
@@ -334,8 +334,8 @@
* passed to the setDefaultLogger() or setThreadLogger() methods.
*
* @code
- * blocxx::Arrayblocxx::String components(1, "*");
- * blocxx::Arrayblocxx::String categories(1, "*");
+ * std::vectorblocxx::String components(1, "*");
+ * std::vectorblocxx::String categories(1, "*");
*
* blocxx::LoggerRef l = ca_mgm::Logger::createSyslogLogger(
* "main", components, categories,
@@ -359,8 +359,8 @@
*/
static blocxx::LoggerRef createSyslogLogger(
const blocxx::String &component,
- const blocxx::Arrayblocxx::String &components,
- const blocxx::Arrayblocxx::String &categories,
+ const blocxx::StringArray &components,
+ const blocxx::StringArray &categories,
const blocxx::String &messageFormat,
const blocxx::String &identity,
const blocxx::String &facility
@@ -375,8 +375,8 @@
* passed to the setDefaultLogger() or setThreadLogger() methods.
*
* @code
- * blocxx::Arrayblocxx::String components(1, "*");
- * blocxx::Arrayblocxx::String categories(1, "*");
+ * std::vectorblocxx::String components(1, "*");
+ * std::vectorblocxx::String categories(1, "*");
*
* blocxx::LoggerRef l = ca_mgm::Logger::createFileLogger(
* "main", components, categories,
@@ -403,8 +403,8 @@
*/
static blocxx::LoggerRef createFileLogger(
const blocxx::String &component,
- const blocxx::Arrayblocxx::String &components,
- const blocxx::Arrayblocxx::String &categories,
+ const blocxx::StringArray &components,
+ const blocxx::StringArray &categories,
const blocxx::String &messageFormat,
const blocxx::String &filename,
blocxx::UInt64 maxLogFileSize = 0,
@@ -419,8 +419,8 @@
* passed to the setDefaultLogger() or setThreadLogger() methods.
*
* @code
- * blocxx::Arrayblocxx::String components(1, "*");
- * blocxx::Arrayblocxx::String categories(1, "*");
+ * std::vectorblocxx::String components(1, "*");
+ * std::vectorblocxx::String categories(1, "*");
*
* blocxx::LoggerRef l = ca_mgm::Logger::createNullLogger(
* "main", components, categories,
@@ -442,8 +442,8 @@
*/
static blocxx::LoggerRef createNullLogger(
const blocxx::String &component,
- const blocxx::Arrayblocxx::String &components,
- const blocxx::Arrayblocxx::String &categories,
+ const blocxx::StringArray &components,
+ const blocxx::StringArray &categories,
const blocxx::String &messageFormat
);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/Url.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/Url.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/Url.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/Url.hpp Sat Jun 12 14:33:19 2010
@@ -206,7 +206,7 @@
* \brief Returns scheme names known to this object.
* \return An array with scheme names known by this object.
*/
- blocxx::StringArray
+ std::vectorblocxx::String
getKnownSchemes() const;
@@ -388,7 +388,7 @@
*
* \return The path parameters splited into an array of substrings.
*/
- blocxx::StringArray
+ std::vectorblocxx::String
getPathParamsArray() const;
/**
@@ -460,7 +460,7 @@
*
* \return The query string splited into an array of substrings.
*/
- blocxx::StringArray
+ std::vectorblocxx::String
getQueryStringArray() const;
/**
@@ -647,7 +647,7 @@
* contains an invalid character.
*/
void
- setPathParamsArray(const blocxx::StringArray &parray);
+ setPathParamsArray(const std::vectorblocxx::String &parray);
/**
* \brief Set the path parameters.
@@ -688,7 +688,7 @@
* contains an invalid character.
*/
void
- setQueryStringArray(const blocxx::StringArray &qarray);
+ setQueryStringArray(const std::vectorblocxx::String &qarray);
/**
* \brief Set the query parameters.
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp Sat Jun 12 14:33:19 2010
@@ -443,7 +443,7 @@
*
* \return An array with scheme names known by this object.
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
getKnownSchemes() const;
/**
@@ -617,7 +617,7 @@
*
* \return The encoded path parameters array.
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
getPathParamsArray() const;
/**
@@ -688,7 +688,7 @@
*
* \return The query string splited into an array of substrings.
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
getQueryStringArray() const;
/**
@@ -874,7 +874,7 @@
* contains an invalid character.
*/
virtual void
- setPathParamsArray(const blocxx::StringArray &parray);
+ setPathParamsArray(const std::vectorblocxx::String &parray);
/**
* \brief Set the path parameters.
@@ -921,7 +921,7 @@
* contains an invalid character.
*/
virtual void
- setQueryStringArray(const blocxx::StringArray &qarray);
+ setQueryStringArray(const std::vectorblocxx::String &qarray);
/**
* \brief Set the query parameters.
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlUtils.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlUtils.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlUtils.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlUtils.hpp Sat Jun 12 14:33:19 2010
@@ -276,7 +276,7 @@
* @return The resulting parameter array.
* @throws UrlNotSupportedException if @p psep separator is empty.
*/
-blocxx::StringArray
+std::vectorblocxx::String
split(const blocxx::String &pstr,
const blocxx::String &psep);
@@ -331,7 +331,7 @@
* @return A parameter string.
*/
blocxx::String
-join(const blocxx::StringArray &parr,
+join(const std::vectorblocxx::String &parr,
const blocxx::String &psep);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityInfoAccessExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityInfoAccessExtension.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityInfoAccessExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityInfoAccessExtension.hpp Sat Jun 12 14:33:19 2010
@@ -115,13 +115,13 @@
* @return Array with error messages. If this Array is empty this
* object is valid
*/
- blocxx::Array<String>
+ std::vector<String>
verify() const;
/**
* Return the content of this object for debugging
*/
- blocxx::Array<String>
+ std::vector<String>
dump() const;
#ifndef SWIG
@@ -220,13 +220,13 @@
* @return Array with error messages. If this Array is empty this
* object is valid
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
/**
* Return the content of this object for debugging
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierExtension.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierExtension.hpp Sat Jun 12 14:33:19 2010
@@ -78,13 +78,13 @@
* @return Array with error messages. If this Array is empty this
* object is valid
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
/**
* Return the content of this object for debugging
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
protected:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp Sat Jun 12 14:33:19 2010
@@ -119,13 +119,13 @@
* @return Array with error messages. If this Array is empty this
* object is valid
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
/**
* Return the content of this object for debugging
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BasicConstraintsExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BasicConstraintsExtension.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BasicConstraintsExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BasicConstraintsExtension.hpp Sat Jun 12 14:33:19 2010
@@ -95,12 +95,12 @@
* @return Array with error messages. If this Array is empty this
* object is valid
*/
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
/**
* Return the content of this object for debugging
*/
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
private:
blocxx::COWIntrusiveReference<BasicConstraintsExtImpl> m_impl;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp Sat Jun 12 14:33:19 2010
@@ -56,9 +56,9 @@
virtual void commit2Config(CA& ca, Type type) const = 0;
virtual bool valid() const = 0;
- virtual blocxx::StringArray verify() const = 0;
+ virtual std::vectorblocxx::String verify() const = 0;
- virtual blocxx::StringArray dump() const = 0;
+ virtual std::vectorblocxx::String dump() const = 0;
protected:
blocxx::COWIntrusiveReference<BitExtensionImpl> m_impl;
@@ -136,12 +136,12 @@
* @return Array with error messages. If this Array is empty this
* object is valid
*/
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
/**
* Return the content of this object for debugging
*/
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
private:
bool validKeyUsage(blocxx::UInt32 keyUsage) const;
@@ -217,12 +217,12 @@
* @return Array with error messages. If this Array is empty this
* object is valid
*/
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
/**
* Return the content of this object for debugging
*/
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
};
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CA.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CA.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CA.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CA.hpp Sat Jun 12 14:33:19 2010
@@ -275,7 +275,7 @@
* <li>status (The status of the certificate: "valid", "revoked", "expired")</li>
* </ul>
*/
- blocxx::Array >
+ std::vector >
getCertificateList();
@@ -297,7 +297,7 @@
* <li>date</li>
* </ul>
*/
- blocxx::Array >
+ std::vector >
getRequestList();
@@ -599,7 +599,7 @@
*
* @return Array of Strings of available CAs
*/
- static blocxx::Arrayblocxx::String
+ static std::vectorblocxx::String
getCAList(const String& repos=REPOSITORY);
/**
@@ -619,7 +619,7 @@
*
* @return a list of lists of the available CAs
*/
- static std::listblocxx::String >
+ static std::listblocxx::String >
getCATree(const String& repos=REPOSITORY);
/**
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLData.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLData.hpp Sat Jun 12 14:33:19 2010
@@ -60,10 +60,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
protected:
@@ -138,10 +138,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
protected:
@@ -149,7 +149,7 @@
CRLData();
- blocxx::StringArray
+ std::vectorblocxx::String
checkRevocationData(const std::map& rd) const;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLDistributionPointsExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLDistributionPointsExtension.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLDistributionPointsExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLDistributionPointsExtension.hpp Sat Jun 12 14:33:19 2010
@@ -61,10 +61,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLGenerationData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLGenerationData.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLGenerationData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLGenerationData.hpp Sat Jun 12 14:33:19 2010
@@ -75,10 +75,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLReason.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLReason.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLReason.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLReason.hpp Sat Jun 12 14:33:19 2010
@@ -112,10 +112,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateData.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateData.hpp Sat Jun 12 14:33:19 2010
@@ -113,10 +113,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
protected:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateIssueData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateIssueData.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateIssueData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateIssueData.hpp Sat Jun 12 14:33:19 2010
@@ -117,13 +117,13 @@
* @return Array with error messages. If this Array is empty this
* object is valid
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
/**
* Return the content of this object for debugging
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificatePoliciesExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificatePoliciesExtension.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificatePoliciesExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificatePoliciesExtension.hpp Sat Jun 12 14:33:19 2010
@@ -73,10 +73,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
#ifndef SWIG
@@ -135,10 +135,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
#ifndef SWIG
@@ -154,10 +154,10 @@
private:
blocxx::COWIntrusiveReference<CertificatePolicyImpl> m_impl;
- blocxx::StringArray
+ std::vectorblocxx::String
checkCpsURIs(const StringList& cpsURIs) const;
- blocxx::StringArray
+ std::vectorblocxx::String
checkNoticeList(const std::list<UserNotice>& list) const;
};
@@ -194,16 +194,16 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
blocxx::COWIntrusiveReference<CertificatePoliciesExtImpl> m_impl;
- blocxx::StringArray
+ std::vectorblocxx::String
checkPolicies(const std::list<CertificatePolicy>& pl) const;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp Sat Jun 12 14:33:19 2010
@@ -51,9 +51,9 @@
String getOpenSSLValue() const;
virtual bool valid() const;
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
#ifndef SWIG
@@ -87,15 +87,15 @@
String getOpenSSLString() const;
virtual bool valid() const;
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
protected:
blocxx::COWIntrusiveReference<DNObjectImpl> m_impl;
private:
- blocxx::StringArray
+ std::vectorblocxx::String
checkRDNList(const std::list<RDNObject>& list) const;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtendedKeyUsageExt.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtendedKeyUsageExt.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtendedKeyUsageExt.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtendedKeyUsageExt.hpp Sat Jun 12 14:33:19 2010
@@ -121,13 +121,13 @@
* @return Array with error messages. If this Array is empty this
* object is valid
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
/**
* Return the content of this object for debugging
*/
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtensionBase.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtensionBase.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtensionBase.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtensionBase.hpp Sat Jun 12 14:33:19 2010
@@ -55,9 +55,9 @@
virtual void commit2Config(CA& ca, Type type) const = 0;
virtual bool valid() const =0;
- virtual blocxx::StringArray verify() const =0;
+ virtual std::vectorblocxx::String verify() const =0;
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
private:
blocxx::COWIntrusiveReference<ExtensionBaseImpl> m_impl;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/IssuerAlternativeNameExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/IssuerAlternativeNameExtension.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/IssuerAlternativeNameExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/IssuerAlternativeNameExtension.hpp Sat Jun 12 14:33:19 2010
@@ -76,10 +76,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/LiteralValues.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/LiteralValues.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/LiteralValues.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/LiteralValues.hpp Sat Jun 12 14:33:19 2010
@@ -101,10 +101,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
/**
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestData.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestData.hpp Sat Jun 12 14:33:19 2010
@@ -98,10 +98,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
protected:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestGenerationData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestGenerationData.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestGenerationData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestGenerationData.hpp Sat Jun 12 14:33:19 2010
@@ -110,10 +110,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/StringExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/StringExtensions.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/StringExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/StringExtensions.hpp Sat Jun 12 14:33:19 2010
@@ -45,9 +45,9 @@
virtual void commit2Config(CA& ca, Type type) const = 0;
virtual bool valid() const = 0;
- virtual blocxx::StringArray verify() const = 0;
+ virtual std::vectorblocxx::String verify() const = 0;
- virtual blocxx::StringArray dump() const = 0;
+ virtual std::vectorblocxx::String dump() const = 0;
protected:
StringExtension(const String &v );
@@ -79,9 +79,9 @@
virtual void commit2Config(CA& ca, Type type) const ;
virtual bool valid() const;
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
};
class NsRevocationUrlExt : public StringExtension {
@@ -104,9 +104,9 @@
virtual void commit2Config(CA& ca, Type type) const;
virtual bool valid() const;
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
};
class NsCaRevocationUrlExt : public StringExtension {
@@ -129,9 +129,9 @@
virtual void commit2Config(CA& ca, Type type) const;
virtual bool valid() const;
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
};
class NsRenewalUrlExt : public StringExtension {
@@ -154,9 +154,9 @@
virtual void commit2Config(CA& ca, Type type) const;
virtual bool valid() const;
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
};
class NsCaPolicyUrlExt : public StringExtension {
public:
@@ -178,9 +178,9 @@
virtual void commit2Config(CA& ca, Type type) const;
virtual bool valid() const;
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
};
class NsSslServerNameExt : public StringExtension {
public:
@@ -202,9 +202,9 @@
virtual void commit2Config(CA& ca, Type type) const;
virtual bool valid() const;
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
};
class NsCommentExt : public StringExtension {
public:
@@ -226,9 +226,9 @@
virtual void commit2Config(CA& ca, Type type) const;
virtual bool valid() const;
- virtual blocxx::StringArray verify() const;
+ virtual std::vectorblocxx::String verify() const;
- virtual blocxx::StringArray dump() const;
+ virtual std::vectorblocxx::String dump() const;
};
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectAlternativeNameExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectAlternativeNameExtension.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectAlternativeNameExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectAlternativeNameExtension.hpp Sat Jun 12 14:33:19 2010
@@ -72,10 +72,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectKeyIdentifierExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectKeyIdentifierExtension.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectKeyIdentifierExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectKeyIdentifierExtension.hpp Sat Jun 12 14:33:19 2010
@@ -68,10 +68,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLExtensions.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLExtensions.hpp Sat Jun 12 14:33:19 2010
@@ -60,10 +60,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
protected:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLGenerationExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLGenerationExtensions.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLGenerationExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLGenerationExtensions.hpp Sat Jun 12 14:33:19 2010
@@ -79,10 +79,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateExtensions.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateExtensions.hpp Sat Jun 12 14:33:19 2010
@@ -114,10 +114,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
protected:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateIssueExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateIssueExtensions.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateIssueExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateIssueExtensions.hpp Sat Jun 12 14:33:19 2010
@@ -233,10 +233,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
private:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3RequestExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3RequestExtensions.hpp?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3RequestExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3RequestExtensions.hpp Sat Jun 12 14:33:19 2010
@@ -138,10 +138,10 @@
virtual bool
valid() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
verify() const;
- virtual blocxx::StringArray
+ virtual std::vectorblocxx::String
dump() const;
protected:
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA1.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CA1.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA1.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA1.cc Sat Jun 12 14:33:19 2010
@@ -24,13 +24,13 @@
try
{
cout << "START" << endl;
-
- StringArray comp;
+
+ blocxx::StringArray comp;
comp.push_back("ca-mgm");
comp.push_back("limal");
-
+
// Logging
-
+
LoggerRef l = ca_mgm::Logger::createCerrLogger(
"CA1",
comp,
@@ -39,29 +39,29 @@
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
CA ca("ca1_test", "system", "./TestRepos/");
-
+
cout << "======================== getRequestDefaults =================" << endl;
RequestGenerationData rgd = ca.getRequestDefaults(E_CA_Req);
cout << "======================== call verify() =================" << endl;
-
- StringArray a = rgd.verify();
-
+
+ std::vectorblocxx::String a = rgd.verify();
+
StringArray::const_iterator it;
-
+
for(it = a.begin(); it != a.end(); ++it)
{
cout << (*it) << endl;
}
-
+
cout << "======================== call dump() =================" << endl;
- StringArray dump = rgd.dump();
+ std::vectorblocxx::String dump = rgd.dump();
StringArray::const_iterator it2;
-
+
for(it2 = dump.begin(); it2 != dump.end(); ++it2)
{
if(!r.match(*it2))
@@ -73,20 +73,20 @@
cout << "======================== getIssueDefaults =================" << endl;
CertificateIssueData cid = ca.getIssueDefaults(E_CA_Cert);
-
+
cout << "======================== call verify() =================" << endl;
a = cid.verify();
-
+
for(it = a.begin(); it != a.end(); ++it)
{
cout << (*it) << endl;
}
-
+
cout << "======================== call dump() =================" << endl;
dump = cid.dump();
-
+
for(it2 = dump.begin(); it2 != dump.end(); ++it2)
{
if(!r.match(*it2))
@@ -98,16 +98,16 @@
cout << "======================== getCRLDefaults =================" << endl;
CRLGenerationData cgd = ca.getCRLDefaults();
-
+
cout << "======================== call verify() =================" << endl;
-
+
a = cgd.verify();
-
+
for(it = a.begin(); it != a.end(); ++it)
{
cout << (*it) << endl;
}
-
+
cout << "======================== call dump() =================" << endl;
dump = cgd.dump();
@@ -121,13 +121,13 @@
}
cout << "DONE" << endl;
-
+
}
catch(Exception& e)
{
cerr << e << endl;
}
-
+
return 0;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc Sat Jun 12 14:33:19 2010
@@ -12,6 +12,9 @@
#include <fstream>
#include
+// FIXME: need to be removed
+#include
+
using namespace blocxx;
using namespace ca_mgm;
@@ -19,13 +22,13 @@
int main(int argc, char **argv)
{
-
+
if ( argc != 2 )
{
cerr << "Usage: CA2 <filepath>" << endl;
exit( 1 );
}
-
+
// Logging
LoggerRef l = ca_mgm::Logger::createCerrLogger(
"CA2",
@@ -34,9 +37,9 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
blocxx::String file = argv[ 1 ];
-
+
cout << "START" << endl;
cout << "file: " << file << endl;
@@ -46,7 +49,7 @@
cerr << "Unable to load '" << file << "'" << endl;
exit( 2 );
}
-
+
while( in )
{
try
@@ -54,16 +57,16 @@
blocxx::String line = blocxx::String::getLine( in );
if(line == "EOF") break;
- StringArray params = PerlRegEx("\\s").split(line);
+ std::vectorblocxx::String params = convStringArray(PerlRegEx("\\s").split(line));
cout << "creating CA object" << endl;
CA ca(params[0], "system", "./TestRepos/");
-
+
RequestGenerationData rgd;
-
+
cout << "============= Test:" << params[0] << "=>" << params[1] << endl;
-
+
if(params[1] == "CA_Req")
{
rgd = ca.getRequestDefaults(E_CA_Req);
@@ -81,20 +84,20 @@
cout << "unknown parameter" << endl;
}
- cout << "============= Call Verify" << endl;
+ cout << "============= Call Verify" << endl;
+
+ std::vectorblocxx::String a = rgd.verify();
- StringArray a = rgd.verify();
-
StringArray::const_iterator it;
for(it = a.begin(); it != a.end(); ++it)
{
cout << (*it) << endl;
}
-
- cout << "============= Call Dump" << endl;
+
+ cout << "============= Call Dump" << endl;
PerlRegEx r("^!CHANGING DATA!.*$");
- StringArray dump = rgd.dump();
+ std::vectorblocxx::String dump = rgd.dump();
StringArray::const_iterator it2;
for(it2 = dump.begin(); it2 != dump.end(); ++it2)
{
@@ -109,7 +112,7 @@
cerr << e << endl;
}
}
-
+
cout << "DONE" << endl;
return 0;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc Sat Jun 12 14:33:19 2010
@@ -12,6 +12,9 @@
#include <fstream>
#include
+// FIXME: need to be removed
+#include
+
using namespace blocxx;
using namespace ca_mgm;
@@ -19,13 +22,13 @@
int main(int argc, char **argv)
{
-
+
if ( argc != 2 )
{
cerr << "Usage: CA3 <filepath>" << endl;
exit( 1 );
}
-
+
// Logging
LoggerRef l = ca_mgm::Logger::createCerrLogger(
"CA3",
@@ -34,9 +37,9 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
blocxx::String file = argv[ 1 ];
-
+
cout << "START" << endl;
cout << "file: " << file << endl;
@@ -46,7 +49,7 @@
cerr << "Unable to load '" << file << "'" << endl;
exit( 2 );
}
-
+
while( in )
{
try
@@ -54,16 +57,16 @@
blocxx::String line = blocxx::String::getLine( in );
if(line == "EOF") break;
- StringArray params = PerlRegEx("\\s").split(line);
+ std::vectorblocxx::String params = convStringArray(PerlRegEx("\\s").split(line));
cout << "creating CA object" << endl;
-
+
CA ca(params[0], "system", "./TestRepos/");
-
+
CertificateIssueData cid;
-
+
cout << "============= Test:" << params[0] << "=>" << params[1] << endl;
-
+
if(params[1] == "CA_Cert")
{
cid = ca.getIssueDefaults(E_CA_Cert);
@@ -81,21 +84,21 @@
cout << "unknown parameter" << endl;
}
- cout << "============= Call Verify" << endl;
+ cout << "============= Call Verify" << endl;
+
+ std::vectorblocxx::String a = cid.verify();
- StringArray a = cid.verify();
-
StringArray::const_iterator it;
for(it = a.begin(); it != a.end(); ++it)
{
cout << (*it) << endl;
}
-
- cout << "============= Call Dump" << endl;
+
+ cout << "============= Call Dump" << endl;
PerlRegEx r("^!CHANGING DATA!.*$");
- StringArray dump = cid.dump();
-
+ std::vectorblocxx::String dump = cid.dump();
+
StringArray::const_iterator it2;
for(it2 = dump.begin(); it2 != dump.end(); ++it2)
{
@@ -110,7 +113,7 @@
cerr << e << endl;
}
}
-
+
cout << "DONE" << endl;
return 0;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc Sat Jun 12 14:33:19 2010
@@ -63,7 +63,7 @@
cout << "============= Call Verify" << endl;
- StringArray a = cgd.verify();
+ std::vectorblocxx::String a = cgd.verify();
StringArray::const_iterator it;
for(it = a.begin(); it != a.end(); ++it)
@@ -74,7 +74,7 @@
cout << "============= Call Dump" << endl;
PerlRegEx r("^!CHANGING DATA!.*$");
- StringArray dump = cgd.dump();
+ std::vectorblocxx::String dump = cgd.dump();
StringArray::const_iterator it2;
for(it2 = dump.begin(); it2 != dump.end(); ++it2)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc Sat Jun 12 14:33:19 2010
@@ -12,6 +12,9 @@
#include <fstream>
#include
+// FIXME: need to be removed
+#include
+
using namespace blocxx;
using namespace ca_mgm;
@@ -19,17 +22,17 @@
int main(int argc, char **argv)
{
-
+
if ( argc != 2 )
{
cerr << "Usage: CA5 <filepath>" << endl;
exit( 1 );
}
- StringArray comp;
+ blocxx::StringArray comp;
comp.push_back("ca-mgm");
comp.push_back("limal");
-
+
// Logging
LoggerRef l = ca_mgm::Logger::createCerrLogger(
"CA5",
@@ -38,9 +41,9 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
blocxx::String file = argv[ 1 ];
-
+
cout << "START" << endl;
cout << "file: " << file << endl;
@@ -50,26 +53,26 @@
cerr << "Unable to load '" << file << "'" << endl;
exit( 2 );
}
-
+
while( in )
- {
+ {
try
- {
+ {
blocxx::String line = blocxx::String::getLine( in );
if(line == "EOF") break;
- StringArray params = PerlRegEx("\\s").split(line);
+ std::vectorblocxx::String params = convStringArray(PerlRegEx("\\s").split(line));
cout << "creating CA object" << endl;
CA ca(params[0], "system", "./TestRepos/");
-
+
RequestGenerationData rgd;
-
+
cout << "============= Test:" << params[0] << "=>" << params[1] << endl;
-
+
Type t = E_CA_Req;
-
+
if(params[1] == "CA_Req")
{
t = E_CA_Req;
@@ -88,11 +91,11 @@
exit(1);
}
- cout << "============= read" << endl;
-
+ cout << "============= read" << endl;
+
rgd = ca.getRequestDefaults(t);
- cout << "============= write back unchanged" << endl;
+ cout << "============= write back unchanged" << endl;
std::list<RDNObject> dnl = rgd.getSubjectDN().getDN();
std::list<RDNObject>::iterator dnit;
@@ -111,23 +114,23 @@
DNObject dn(dnl);
rgd.setSubjectDN(dn);
ca.setRequestDefaults(t, rgd);
-
- cout << "============= re-read" << endl;
-
+
+ cout << "============= re-read" << endl;
+
RequestGenerationData Nrgd;
Nrgd = ca.getRequestDefaults(t);
-
- StringArray a = Nrgd.verify();
+
+ std::vectorblocxx::String a = Nrgd.verify();
StringArray::const_iterator it;
for(it = a.begin(); it != a.end(); ++it)
{
cout << (*it) << endl;
}
-
- cout << "============= Call Dump" << endl;
+
+ cout << "============= Call Dump" << endl;
PerlRegEx r("^!CHANGING DATA!.*$");
- StringArray dump = Nrgd.dump();
+ std::vectorblocxx::String dump = Nrgd.dump();
StringArray::const_iterator it2;
for(it2 = dump.begin(); it2 != dump.end(); ++it2)
{
@@ -142,7 +145,7 @@
cerr << e << endl;
}
}
-
+
cout << "DONE" << endl;
return 0;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc Sat Jun 12 14:33:19 2010
@@ -12,6 +12,9 @@
#include <fstream>
#include
+// FIXME: need to be removed
+#include
+
using namespace blocxx;
using namespace ca_mgm;
@@ -25,10 +28,10 @@
exit( 1 );
}
- StringArray comp;
+ blocxx::StringArray comp;
comp.push_back("ca-mgm");
comp.push_back("limal");
-
+
// Logging
LoggerRef l = ca_mgm::Logger::createCerrLogger(
"CA6",
@@ -37,9 +40,9 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
blocxx::String file = argv[ 1 ];
-
+
cout << "START" << endl;
cout << "file: " << file << endl;
@@ -49,26 +52,26 @@
cerr << "Unable to load '" << file << "'" << endl;
exit( 2 );
}
-
+
while( in )
- {
+ {
try
- {
+ {
blocxx::String line = blocxx::String::getLine( in );
if(line == "EOF") break;
- StringArray params = PerlRegEx("\\s").split(line);
+ std::vectorblocxx::String params = convStringArray(PerlRegEx("\\s").split(line));
cout << "creating CA object" << endl;
-
+
CA ca(params[0], "system", "./TestRepos/");
-
+
CertificateIssueData cid;
-
+
cout << "============= Test:" << params[0] << "=>" << params[1] << endl;
-
+
Type t = E_CA_Req;
-
+
if(params[1] == "CA_Cert")
{
t = E_CA_Cert;
@@ -87,33 +90,33 @@
exit(1);
}
- cout << "============= read" << endl;
-
+ cout << "============= read" << endl;
+
cid = ca.getIssueDefaults(t);
- cout << "============= write back unchanged" << endl;
+ cout << "============= write back unchanged" << endl;
ca.setIssueDefaults(t, cid);
-
- cout << "============= re-read" << endl;
+
+ cout << "============= re-read" << endl;
CertificateIssueData Ncid;
Ncid = ca.getIssueDefaults(t);
- cout << "============= Call Verify" << endl;
+ cout << "============= Call Verify" << endl;
+
+ std::vectorblocxx::String a = Ncid.verify();
- StringArray a = Ncid.verify();
-
StringArray::const_iterator it;
for(it = a.begin(); it != a.end(); ++it)
{
cout << (*it) << endl;
}
-
- cout << "============= Call Dump" << endl;
+
+ cout << "============= Call Dump" << endl;
PerlRegEx r("^!CHANGING DATA!.*$");
- StringArray dump = Ncid.dump();
+ std::vectorblocxx::String dump = Ncid.dump();
StringArray::const_iterator it2;
for(it2 = dump.begin(); it2 != dump.end(); ++it2)
{
@@ -128,7 +131,7 @@
cerr << e << endl;
}
}
-
+
cout << "DONE" << endl;
return 0;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc Sat Jun 12 14:33:19 2010
@@ -12,6 +12,9 @@
#include <fstream>
#include
+// FIXME: need to be removed
+#include
+
using namespace blocxx;
using namespace ca_mgm;
@@ -24,8 +27,8 @@
cerr << "Usage: CA7 <filepath>" << endl;
exit( 1 );
}
-
- StringArray comp;
+
+ blocxx::StringArray comp;
comp.push_back("ca-mgm");
comp.push_back("limal");
@@ -37,61 +40,61 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
blocxx::String file = argv[ 1 ];
-
+
cout << "START" << endl;
cout << "file: " << file << endl;
-
+
ifstream in( file.c_str() );
if ( in.fail() )
{
cerr << "Unable to load '" << file << "'" << endl;
exit( 2 );
}
-
+
while( in )
- {
+ {
try
- {
+ {
blocxx::String line = blocxx::String::getLine( in );
if(line == "EOF") break;
cout << "creating CA object" << endl;
-
+
CA ca(line, "system", "./TestRepos/");
-
+
CRLGenerationData cgd;
-
+
cout << "============= Test:" << line << endl;
-
- cout << "============= read" << endl;
+
+ cout << "============= read" << endl;
cgd = ca.getCRLDefaults();
- cout << "============= write back unchanged" << endl;
+ cout << "============= write back unchanged" << endl;
ca.setCRLDefaults(cgd);
- cout << "============= re-read" << endl;
+ cout << "============= re-read" << endl;
CRLGenerationData Ncgd;
Ncgd = ca.getCRLDefaults();
- cout << "============= Call Verify" << endl;
+ cout << "============= Call Verify" << endl;
+
+ std::vectorblocxx::String a = Ncgd.verify();
- StringArray a = Ncgd.verify();
-
StringArray::const_iterator it;
for(it = a.begin(); it != a.end(); ++it)
{
cout << (*it) << endl;
}
-
- cout << "============= Call Dump" << endl;
+
+ cout << "============= Call Dump" << endl;
PerlRegEx r("^!CHANGING DATA!.*$");
- StringArray dump = Ncgd.dump();
+ std::vectorblocxx::String dump = Ncgd.dump();
StringArray::const_iterator it2;
for(it2 = dump.begin(); it2 != dump.end(); ++it2)
{
@@ -99,14 +102,14 @@
{
cout << (*it2) << endl;
}
- }
+ }
}
catch(Exception& e)
{
cerr << e << endl;
}
}
-
+
cout << "DONE" << endl;
return 0;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc Sat Jun 12 14:33:19 2010
@@ -23,13 +23,13 @@
{
cout << "START" << endl;
- StringArray cat;
+ blocxx::StringArray cat;
cat.push_back("FATAL");
cat.push_back("ERROR");
cat.push_back("INFO");
//cat.push_back("DEBUG");
-
+
// Logging
LoggerRef l = ca_mgm::Logger::createCerrLogger(
"CA8",
@@ -38,17 +38,17 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
RequestGenerationData rgd = CA::getRootCARequestDefaults("./TestRepos/");
CertificateIssueData cid = CA::getRootCAIssueDefaults("./TestRepos/");
-
+
std::list<RDNObject> dnl = rgd.getSubjectDN().getDN();
std::list<RDNObject>::iterator dnit;
for(dnit = dnl.begin(); dnit != dnl.end(); ++dnit)
{
cout << "DN Key " << (*dnit).getType() << endl;
-
+
if((*dnit).getType() == "countryName")
{
(*dnit).setRDNValue("DE");
@@ -62,10 +62,10 @@
(*dnit).setRDNValue("suse@suse.de");
}
}
-
+
DNObject dn(dnl);
rgd.setSubjectDN(dn);
-
+
CA::createRootCA("Test_CA", "system", rgd, cid, "./TestRepos/");
path::PathInfo iKey("./TestRepos/Test_CA/cacert.key");
@@ -93,7 +93,7 @@
if(iReq.isFile())
{
cout << iReq.toString() << " IS FILE" < 0)
{
cout << "Size is greater then 0" << endl;
@@ -111,7 +111,7 @@
if(iCrt.isFile())
{
cout << iCrt.toString() << " IS FILE" < 0)
{
cout << "Size is greater then 0" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc Sat Jun 12 14:33:19 2010
@@ -36,7 +36,7 @@
cout << "=================== start CA List ======================" << endl;
- StringArray list = CA::getCAList("./TestRepos/");
+ std::vectorblocxx::String list = CA::getCAList("./TestRepos/");
StringArray::const_iterator it;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CRLTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CRLTest.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CRLTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CRLTest.cc Sat Jun 12 14:33:19 2010
@@ -50,7 +50,7 @@
cgd.extensions().issuerAlternativeName().setCopyIssuer(true);
cgd.extensions().issuerAlternativeName().setAlternativeNameList(list);
-
+
ca.createCRL(cgd);
path::PathInfo pi2("./TestRepos/Test_CA1/crl/crl.pem");
@@ -61,9 +61,9 @@
CRLData cd = ca.getCRL();
- StringArray ret = cd.getExtensions().dump();
- StringArray::const_iterator it;
-
+ std::vectorblocxx::String ret = cd.getExtensions().dump();
+ std::vectorblocxx::String::const_iterator it;
+
for(it = ret.begin(); it != ret.end(); ++it)
{
cout << (*it) << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc Sat Jun 12 14:33:19 2010
@@ -22,7 +22,7 @@
try
{
cout << "START" << endl;
-
+
blocxx::StringArray cat;
cat.push_back("FATAL");
cat.push_back("ERROR");
@@ -37,7 +37,7 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req);
@@ -47,7 +47,7 @@
for(dnit = dnl.begin(); dnit != dnl.end(); ++dnit)
{
cout << "DN Key " << (*dnit).getType() << endl;
-
+
if((*dnit).getType() == "countryName")
{
(*dnit).setRDNValue("DE");
@@ -61,12 +61,12 @@
(*dnit).setRDNValue("suse@suse.de");
}
}
-
+
DNObject dn(dnl);
rgd.setSubjectDN(dn);
blocxx::String r = ca.createRequest("system", rgd, E_Client_Req);
-
+
cout << "RETURN Request " << endl;
CertificateIssueData cid = ca.getIssueDefaults(E_Client_Cert);
@@ -76,7 +76,7 @@
cout << "RETURN Certificate " << endl;
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
-
+
cout << "Certificate exists: " << Bool(pi.exists()) << endl;
cout << "DONE" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc Sat Jun 12 14:33:19 2010
@@ -22,8 +22,8 @@
try
{
cout << "START" << endl;
-
- StringArray cat;
+
+ blocxx::StringArray cat;
cat.push_back("FATAL");
cat.push_back("ERROR");
cat.push_back("INFO");
@@ -37,17 +37,17 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Server_Req);
std::list<RDNObject> dnl = rgd.getSubjectDN().getDN();
std::list<RDNObject>::iterator dnit;
-
+
for(dnit = dnl.begin(); dnit != dnl.end(); ++dnit)
{
cout << "DN Key " << (*dnit).getType() << endl;
-
+
if((*dnit).getType() == "countryName")
{
(*dnit).setRDNValue("DE");
@@ -61,7 +61,7 @@
(*dnit).setRDNValue("suse@suse.de");
}
}
-
+
DNObject dn(dnl);
rgd.setSubjectDN(dn);
@@ -71,7 +71,7 @@
cout << "RETURN Certificate " << endl;
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
-
+
cout << "Certificate exists: " << Bool(pi.exists()) << endl;
cout << "DONE" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc Sat Jun 12 14:33:19 2010
@@ -22,7 +22,7 @@
try
{
cout << "START" << endl;
-
+
blocxx::StringArray cat;
cat.push_back("FATAL");
cat.push_back("ERROR");
@@ -37,19 +37,19 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req);
-
+
// ------------------------ Set DN --------------------------------
-
+
list<RDNObject> dnl = rgd.getSubjectDN().getDN();
list<RDNObject>::iterator dnit;
-
+
for(dnit = dnl.begin(); dnit != dnl.end(); ++dnit)
{
cout << "DN Key " << (*dnit).getType() << endl;
-
+
if((*dnit).getType() == "countryName")
{
(*dnit).setRDNValue("DE");
@@ -63,14 +63,14 @@
(*dnit).setRDNValue("suse@suse.de");
}
}
-
+
DNObject dn(dnl);
rgd.setSubjectDN(dn);
// ------------------------ create request --------------------------------
blocxx::String r = ca.createRequest("system", rgd, E_Client_Req);
-
+
cout << "RETURN Request " << endl;
// ------------------------ get issue defaults --------------------------------
@@ -90,7 +90,7 @@
// ------------------------ create bit extension -----------------------------
KeyUsageExt ku(KeyUsageExt::decipherOnly);
- NsCertTypeExt nsCertType(NsCertTypeExt::objCA |
+ NsCertTypeExt nsCertType(NsCertTypeExt::objCA |
NsCertTypeExt::emailCA |
NsCertTypeExt::sslCA);
@@ -108,17 +108,17 @@
sl.push_back("nsSGC");
ExtendedKeyUsageExt extendedKeyUsage( sl );
-
+
// ------------------------ create key identifier extension -----------------------------
-
+
SubjectKeyIdentifierExt subjectKeyIdentifier(true);
- AuthorityKeyIdentifierGenerateExt
+ AuthorityKeyIdentifierGenerateExt
authorityKeyIdentifier(
AuthorityKeyIdentifierGenerateExt::KeyID_always,
AuthorityKeyIdentifierGenerateExt::Issuer_always);
// ------------------------ create alternative extension -----------------------------
-
+
list<LiteralValue> list;
list.push_back(LiteralValue("IP", "164.34.35.184"));
list.push_back(LiteralValue("IP", "2001:780:101:a00:211:11ff:fee6:a5af"));
@@ -126,18 +126,18 @@
list.push_back(LiteralValue("RID", "1.2.3.4"));
list.push_back(LiteralValue("email", "me@my-company.com"));
list.push_back(LiteralValue("URI", "http://www.my-company.com/"));
-
+
SubjectAlternativeNameExt subjectAlternativeName(true, list);
IssuerAlternativeNameExt issuerAlternativeName(true, list);
// ---------------- create authority information extension ------------------------
-
+
std::list info;
- info.push_back(AuthorityInformation("OCSP",
+ info.push_back(AuthorityInformation("OCSP",
LiteralValue("URI", "http://www.my-company.com/ocsp.pl")));
- info.push_back(AuthorityInformation("caIssuers",
+ info.push_back(AuthorityInformation("caIssuers",
LiteralValue("URI", "http://www.my-company.com/caIssuer.html")));
-
+
AuthorityInfoAccessExt authorityInfoAccess;
authorityInfoAccess.setAuthorityInformation(info);
@@ -156,7 +156,7 @@
CertificatePolicy p2;
p2.setPolicyIdentifier("1.3.6.8");
-
+
StringList slp;
slp.push_back("http://www.my-company.com/");
slp.push_back("http://www2.my-company.com/");
@@ -177,7 +177,7 @@
p.push_back(p2);
CertificatePoliciesExt certificatePolicies(p);
-
+
// ------------------------ get current extensions -----------------------------
X509v3CertificateIssueExts ex = cid.getExtensions();
@@ -206,13 +206,13 @@
ex.setCertificatePolicies(certificatePolicies);
cid.setExtensions(ex);
-
+
blocxx::String c = ca.issueCertificate(r, cid, E_CA_Cert);
cout << "RETURN Certificate " << endl;
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
-
+
cout << "Certificate exists: " << Bool(pi.exists()) << endl;
cout << "DONE" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc Sat Jun 12 14:33:19 2010
@@ -12,6 +12,9 @@
#include <fstream>
#include
+// FIXME: need to be removed
+#include
+
using namespace blocxx;
using namespace ca_mgm;
@@ -23,7 +26,7 @@
try
{
cout << "START" << endl;
-
+
blocxx::StringArray cat;
cat.push_back("FATAL");
cat.push_back("ERROR");
@@ -38,19 +41,19 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req);
-
+
// ------------------------ Set DN --------------------------------
-
+
std::list<RDNObject> dnl = rgd.getSubjectDN().getDN();
std::list<RDNObject>::iterator dnit;
-
+
for(dnit = dnl.begin(); dnit != dnl.end(); ++dnit)
{
cout << "DN Key " << (*dnit).getType() << endl;
-
+
if((*dnit).getType() == "countryName")
{
(*dnit).setRDNValue("DE");
@@ -64,14 +67,14 @@
(*dnit).setRDNValue("suse@suse.de");
}
}
-
+
DNObject dn(dnl);
rgd.setSubjectDN(dn);
// ------------------------ create request --------------------------------
blocxx::String r = ca.createRequest("system", rgd, E_Client_Req);
-
+
cout << "RETURN Request " << endl;
// ------------------------ get issue defaults --------------------------------
@@ -92,7 +95,7 @@
// ------------------------ create bit extension -----------------------------
cid.extensions().keyUsage().setKeyUsage(KeyUsageExt::decipherOnly);
- cid.extensions().nsCertType().setNsCertType(NsCertTypeExt::objCA |
+ cid.extensions().nsCertType().setNsCertType(NsCertTypeExt::objCA |
NsCertTypeExt::emailCA |
NsCertTypeExt::sslCA);
@@ -110,35 +113,35 @@
sl.push_back("nsSGC");
cid.extensions().extendedKeyUsage().setExtendedKeyUsage( sl );
-
+
// ------------------------ create key identifier extension -----------------------------
-
+
cid.extensions().subjectKeyIdentifier().setSubjectKeyIdentifier(true);
cid.extensions().authorityKeyIdentifier().setKeyID(AuthorityKeyIdentifierGenerateExt::KeyID_always);
cid.extensions().authorityKeyIdentifier().setIssuer(AuthorityKeyIdentifierGenerateExt::Issuer_always);
// ------------------------ create alternative extension -----------------------------
-
+
std::list<LiteralValue> list;
list.push_back(LiteralValue("IP", "164.34.35.184"));
list.push_back(LiteralValue("DNS", "ca.my-company.com"));
list.push_back(LiteralValue("RID", "1.2.3.4"));
list.push_back(LiteralValue("email", "me@my-company.com"));
list.push_back(LiteralValue("URI", "http://www.my-company.com/"));
-
+
cid.extensions().subjectAlternativeName().setCopyEmail(true);
cid.extensions().subjectAlternativeName().setAlternativeNameList(list);
cid.extensions().issuerAlternativeName().setCopyIssuer(true);
cid.extensions().issuerAlternativeName().setAlternativeNameList(list);
-
+
// ---------------- create authority information extension ------------------------
-
+
std::list<AuthorityInformation> info;
- info.push_back(AuthorityInformation("OCSP",
+ info.push_back(AuthorityInformation("OCSP",
LiteralValue("URI", "http://www.my-company.com/ocsp.pl")));
- info.push_back(AuthorityInformation("caIssuers",
+ info.push_back(AuthorityInformation("caIssuers",
LiteralValue("URI", "http://www.my-company.com/caIssuer.html")));
-
+
cid.extensions().authorityInfoAccess().setAuthorityInformation(info);
// ------------------------ create CRL dist point extension -----------------------
@@ -155,7 +158,7 @@
CertificatePolicy p2;
p2.setPolicyIdentifier("1.3.6.8");
-
+
StringList slp;
slp.push_back("http://www.my-company.com/");
slp.push_back("http://www2.my-company.com/");
@@ -176,22 +179,22 @@
p.push_back(p2);
cid.extensions().certificatePolicies().setPolicies(p);
-
+
//---------------------------------------------------------------------------------
-
+
blocxx::String c = ca.issueCertificate(r, cid, E_CA_Cert);
cout << "RETURN Certificate " << endl;
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
-
+
cout << "Certificate exists: " << Bool(pi.exists()) << endl;
CertificateData cd = ca.getCertificate(c);
-
- StringArray ret = cd.getExtensions().dump();
- StringArray::const_iterator it;
-
+
+ std::vectorblocxx::String ret = cd.getExtensions().dump();
+ std::vectorblocxx::String::const_iterator it;
+
for(it = ret.begin(); it != ret.end(); ++it)
{
if((*it).startsWith("KeyID"))
@@ -203,7 +206,7 @@
cout << (*it) << endl;
}
}
-
+
cout << "DONE" << endl;
}
catch(Exception& e)
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc Sat Jun 12 14:33:19 2010
@@ -23,7 +23,7 @@
try
{
cout << "START" << endl;
-
+
blocxx::StringArray cat;
cat.push_back("FATAL");
cat.push_back("ERROR");
@@ -38,19 +38,19 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req);
-
+
// ------------------------ Set DN --------------------------------
-
+
std::list<RDNObject> dnl = rgd.getSubjectDN().getDN();
std::list<RDNObject>::iterator dnit;
-
+
for(dnit = dnl.begin(); dnit != dnl.end(); ++dnit)
{
cout << "DN Key " << (*dnit).getType() << endl;
-
+
if((*dnit).getType() == "countryName")
{
(*dnit).setRDNValue("DE");
@@ -64,14 +64,14 @@
(*dnit).setRDNValue("suse@suse.de");
}
}
-
+
DNObject dn(dnl);
rgd.setSubjectDN(dn);
// ------------------------ create request --------------------------------
blocxx::String r = ca.createRequest("system", rgd, E_Client_Req);
-
+
cout << "RETURN Request " << endl;
// ------------------------ get issue defaults --------------------------------
@@ -81,7 +81,7 @@
// ------------------------ create bit extension -----------------------------
cid.extensions().keyUsage().setKeyUsage(KeyUsageExt::decipherOnly);
- cid.extensions().nsCertType().setNsCertType(NsCertTypeExt::objCA |
+ cid.extensions().nsCertType().setNsCertType(NsCertTypeExt::objCA |
NsCertTypeExt::emailCA |
NsCertTypeExt::sslCA);
@@ -90,7 +90,7 @@
cid.extensions().basicConstraints().setBasicConstraints(true, 3);
// ------------------------ create alternative extension -----------------------------
-
+
std::list<LiteralValue> list;
list.push_back(LiteralValue("DNS", "ca.my-company.com"));
list.push_back(LiteralValue("DNS", "127-55-2-80ca.my-company.com"));
@@ -100,28 +100,28 @@
list.push_back(LiteralValue("1.3.6.1.4.1.311.20.2.3", "me/admin@MY-COMPANY.COM")); // ms_upn
list.push_back(LiteralValue("1.3.6.1.5.2.2", "me/admin@MY-COMPANY.COM")); // krb5PrincipalName
list.push_back(LiteralValue("IP", "2001:780:101:a00:211:11ff:fee6:a5af")); // IPv6 address
-
+
cid.extensions().subjectAlternativeName().setCopyEmail(true);
cid.extensions().subjectAlternativeName().setAlternativeNameList(list);
cid.extensions().issuerAlternativeName().setCopyIssuer(true);
cid.extensions().issuerAlternativeName().setAlternativeNameList(list);
-
+
blocxx::String c = ca.issueCertificate(r, cid, E_CA_Cert);
//sleep(10000);
-
+
cout << "RETURN Certificate " << endl;
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
-
+
cout << "Certificate exists: " << Bool(pi.exists()) << endl;
CertificateData cd = ca.getCertificate(c);
-
- StringArray ret = cd.getExtensions().dump();
- StringArray::const_iterator it;
-
+
+ std::vectorblocxx::String ret = cd.getExtensions().dump();
+ std::vectorblocxx::String::const_iterator it;
+
for(it = ret.begin(); it != ret.end(); ++it)
{
if((*it).startsWith("KeyID"))
@@ -133,7 +133,7 @@
cout << (*it) << endl;
}
}
-
+
cout << "DONE" << endl;
}
catch(Exception& e)
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc Sat Jun 12 14:33:19 2010
@@ -23,7 +23,7 @@
try
{
cout << "START" << endl;
-
+
blocxx::StringArray cat;
cat.push_back("FATAL");
cat.push_back("ERROR");
@@ -38,19 +38,19 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req);
-
+
// ------------------------ Set DN --------------------------------
-
+
std::list<RDNObject> dnl = rgd.getSubjectDN().getDN();
std::list<RDNObject>::iterator dnit;
-
+
for(dnit = dnl.begin(); dnit != dnl.end(); ++dnit)
{
cout << "DN Key " << (*dnit).getType() << endl;
-
+
if((*dnit).getType() == "countryName")
{
(*dnit).setRDNValue("DE");
@@ -64,14 +64,14 @@
(*dnit).setRDNValue("suse@suse.de");
}
}
-
+
DNObject dn(dnl);
rgd.setSubjectDN(dn);
// ------------------------ create request --------------------------------
blocxx::String r = ca.createRequest("system", rgd, E_Client_Req);
-
+
cout << "RETURN Request " << endl;
// ------------------------ get issue defaults --------------------------------
@@ -81,7 +81,7 @@
// ------------------------ create bit extension -----------------------------
cid.extensions().keyUsage().setKeyUsage(KeyUsageExt::decipherOnly);
- cid.extensions().nsCertType().setNsCertType(NsCertTypeExt::objCA |
+ cid.extensions().nsCertType().setNsCertType(NsCertTypeExt::objCA |
NsCertTypeExt::emailCA |
NsCertTypeExt::sslCA);
@@ -90,7 +90,7 @@
cid.extensions().basicConstraints().setBasicConstraints(true, 3);
// ------------------------ create alternative extension -----------------------------
-
+
std::list<LiteralValue> list;
list.push_back(LiteralValue("DNS", "ca.my-company.com"));
list.push_back(LiteralValue("DNS", "127-55-2-80 ca.my-company.com"));
@@ -100,28 +100,28 @@
list.push_back(LiteralValue("1.3.6.1.4.1.311.20.2.3", "me/admin@MY-COMPANY.COM")); // ms_upn
list.push_back(LiteralValue("1.3.6.1.5.2.2", "me/admin@MY-COMPANY.COM")); // krb5PrincipalName
list.push_back(LiteralValue("IP", "2001:780:101:a00:211:11ff:fee6:a5af")); // IPv6 address
-
+
cid.extensions().subjectAlternativeName().setCopyEmail(true);
cid.extensions().subjectAlternativeName().setAlternativeNameList(list);
cid.extensions().issuerAlternativeName().setCopyIssuer(true);
cid.extensions().issuerAlternativeName().setAlternativeNameList(list);
-
+
blocxx::String c = ca.issueCertificate(r, cid, E_CA_Cert);
//sleep(10000);
-
+
cout << "RETURN Certificate " << endl;
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
-
+
cout << "Certificate exists: " << Bool(pi.exists()) << endl;
CertificateData cd = ca.getCertificate(c);
-
- StringArray ret = cd.getExtensions().dump();
- StringArray::const_iterator it;
-
+
+ std::vectorblocxx::String ret = cd.getExtensions().dump();
+ std::vectorblocxx::String::const_iterator it;
+
for(it = ret.begin(); it != ret.end(); ++it)
{
if((*it).startsWith("KeyID"))
@@ -133,7 +133,7 @@
cout << (*it) << endl;
}
}
-
+
cout << "DONE" << endl;
}
catch(Exception& e)
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc Sat Jun 12 14:33:19 2010
@@ -49,21 +49,21 @@
{
ByteBuffer pem = LocalManagement::readFile("./TestRepos3/SUSERootCA/cacert.pem");
-
+
ByteBuffer der = LocalManagement::x509Convert(pem, E_PEM, E_DER);
-
+
if(der.size() > 0)
{
cout << "Got DER certificate" << endl;
}
-
+
ByteBuffer pem2 = LocalManagement::x509Convert(der, E_DER, E_PEM);
-
+
if(pem2.size() > 0)
{
cout << "Got PEM certificate" << endl;
}
-
+
if(pem == pem2)
{
cout << "correct" << endl;
@@ -74,21 +74,21 @@
{
ByteBuffer pem = LocalManagement::readFile("./TestRepos3/SUSERootCA/cacert.req");
-
+
ByteBuffer der = LocalManagement::reqConvert(pem, E_PEM, E_DER);
-
+
if(der.size() > 0)
{
cout << "Got DER request" << endl;
}
-
+
ByteBuffer pem2 = LocalManagement::reqConvert(der, E_DER, E_PEM);
-
+
if(pem2.size() > 0)
{
cout << "Got PEM request" << endl;
}
-
+
if(pem == pem2)
{
cout << "correct" << endl;
@@ -99,21 +99,21 @@
{
ByteBuffer pem = LocalManagement::readFile("./TestRepos3/SUSERootCA/crl/crl.pem");
-
+
ByteBuffer der = LocalManagement::crlConvert(pem, E_PEM, E_DER);
-
+
if(der.size() > 0)
{
cout << "Got DER CRL" << endl;
}
-
+
ByteBuffer pem2 = LocalManagement::crlConvert(der, E_DER, E_PEM);
-
+
if(pem2.size() > 0)
{
cout << "Got PEM CRL" << endl;
}
-
+
if(pem == pem2)
{
cout << "correct" << endl;
@@ -124,16 +124,16 @@
{
ByteBuffer pem = LocalManagement::readFile("./TestRepos3/SUSERootCA/cacert.key");
-
+
ByteBuffer der = LocalManagement::rsaConvert(pem, E_PEM, E_DER, "system", "");
-
+
if(der.size() > 0)
{
cout << "Got DER Key" << endl;
}
-
+
ByteBuffer pem2 = LocalManagement::rsaConvert(der, E_DER, E_PEM, "", "tralla", "aes256");
-
+
if(pem2.size() > 0)
{
cout << "Got PEM Key" << endl;
@@ -147,7 +147,7 @@
{
cout << "!!!WRONG encryption" << endl;
}
-
+
//cout << pem2.data() << endl;
}
}
@@ -158,17 +158,17 @@
ByteBuffer crt = LocalManagement::readFile("./TestRepos3/SUSERootCA/certs/01.pem");
ByteBuffer key = LocalManagement::readFile("./TestRepos3/SUSERootCA/keys/a64a6c95f2a3dc22975e13691ad8e2bb-1111160526.key");
ByteBuffer ca = LocalManagement::readFile("./TestRepos3/SUSERootCA/cacert.pem");
-
+
ByteBuffer p12 = LocalManagement::createPKCS12(crt, key, "system", "tralla",
ca, "./TestRepos3/.cas/", false);
-
+
if(p12.size() > 0)
{
cout << "Got PKCS12 data" << endl;
}
-
+
ByteBuffer pem = LocalManagement::pkcs12ToPEM(p12, "tralla", "system", "aes256");
-
+
if(pem.size() > 0)
{
cout << "Got PEM " << endl;
@@ -182,7 +182,7 @@
{
cout << "!!!WRONG encryption" << endl;
}
-
+
//cout << pem.data() << endl;
}
}
@@ -194,13 +194,13 @@
cout << "===================== Test rsaConvert Exception =====================" << endl;
-
+
try
{
ByteBuffer pem = LocalManagement::readFile("./TestRepos3/SUSERootCA/cacert.key");
-
+
ByteBuffer der = LocalManagement::rsaConvert(pem, E_PEM, E_DER, "wrong password", "");
-
+
if(der.size() > 0)
{
cout << "Got DER Key" << endl;
@@ -211,7 +211,7 @@
cout << "Got expected Exception." << endl;
cerr << "Exception:" << endl << e.getFile() << ": " << e.type() << ": " << e.getErrorCode() << ": ";
blocxx::String msg = blocxx::String(e.getMessage());
-
+
cerr << msg.tokenize("\n\r")[0] << endl << "END" << endl;
}
@@ -223,12 +223,12 @@
ByteBuffer ca = LocalManagement::readFile("./TestRepos3/SUSERootCA/cacert.pem");
ByteBuffer p12;
-
+
try
{
p12 = LocalManagement::createPKCS12(crt, key, "wrong password", "tralla",
ca, "./TestRepos3/.cas/", false);
-
+
if(p12.size() > 0)
{
cout << "Got PKCS12 data" << endl;
@@ -242,18 +242,18 @@
cerr << msg.tokenize("\n\r")[0] << endl << "END" << endl;
}
-
+
p12 = LocalManagement::createPKCS12(crt, key, "system", "tralla",
ca, "./TestRepos3/.cas/", false);
-
+
try
{
ByteBuffer pem = LocalManagement::pkcs12ToPEM(p12, "wrong password", "system", "aes256");
-
+
if(pem.size() > 0)
{
cout << "Got PEM " << endl;
-
+
PerlRegEx p("DEK-Info: AES-256-CBC");
if(p.match(pem.data()))
{
@@ -263,7 +263,7 @@
{
cout << "!!!WRONG encryption" << endl;
}
-
+
//cout << pem.data() << endl;
}
}
@@ -275,7 +275,7 @@
cerr << msg.tokenize("\n\r")[0] << endl << "END" << endl;
}
-
+
cout << "DONE" << endl;
return 0;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc Sat Jun 12 14:33:19 2010
@@ -44,29 +44,29 @@
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
CA ca("SUSEIPsecCA", "system", "./TestRepos3/");
-
- cout << "==================== ca.exportCACert(PEM); ======================" << endl;
+
+ cout << "==================== ca.exportCACert(PEM); ======================" << endl;
ByteBuffer ba = ca.exportCACert(E_PEM);
-
+
CertificateData cd = LocalManagement::getCertificate(ba, E_PEM);
cout << "Subject: " << cd.getSubjectDN().getOpenSSLString() << endl;
- cout << "==================== ca.exportCACert(DER); ======================" << endl;
+ cout << "==================== ca.exportCACert(DER); ======================" << endl;
ba = ca.exportCACert(E_DER);
-
+
cd = LocalManagement::getCertificate(ba, E_DER);
cout << "Subject: " << cd.getSubjectDN().getOpenSSLString() << endl;
- cout << "==================== ca.exportCAKeyAsPEM(''); ======================" << endl;
+ cout << "==================== ca.exportCAKeyAsPEM(''); ======================" << endl;
ba = ca.exportCAKeyAsPEM("");
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testCAKey.key");
path::PathInfo pi("./TestRepos3/testCAKey.key");
@@ -78,7 +78,7 @@
if(!r.match(blocxx::String(ba.data(), ba.size())))
{
cout << "Key is decrypted" << endl;
-
+
path::removeFile("./TestRepos3/testCAKey.key");
}
else
@@ -87,10 +87,10 @@
}
}
- cout << "==================== ca.exportCAKeyAsPEM('tralla'); ======================" << endl;
+ cout << "==================== ca.exportCAKeyAsPEM('tralla'); ======================" << endl;
ba = ca.exportCAKeyAsPEM("tralla");
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testCAKey2.key");
pi.stat("./TestRepos3/testCAKey2.key");
@@ -98,7 +98,7 @@
if(pi.exists())
{
cout << "Key exists" << endl;
-
+
if(!r.match(blocxx::String(ba.data(), ba.size())))
{
cout << "Key is decrypted" << endl;
@@ -111,10 +111,10 @@
}
}
- cout << "==================== ca.exportCAKeyAsDER(); ======================" << endl;
+ cout << "==================== ca.exportCAKeyAsDER(); ======================" << endl;
ba = ca.exportCAKeyAsDER();
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testCAKeyDER.key");
pi.stat("./TestRepos3/testCAKeyDER.key");
@@ -122,14 +122,14 @@
if(pi.exists() && pi.size() > 1000)
{
cout << "Key exists" << endl;
-
+
path::removeFile("./TestRepos3/testCAKeyDER.key");
}
- cout << "=============== ca.exportCAasPKCS12('tralla', false); ===============" << endl;
+ cout << "=============== ca.exportCAasPKCS12('tralla', false); ===============" << endl;
ba = ca.exportCAasPKCS12("tralla", false);
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testCA.p12");
pi.stat("./TestRepos3/testCA.p12");
@@ -137,14 +137,14 @@
if(pi.exists() && pi.size() > 2500)
{
cout << "Certificate exists" << endl;
-
+
path::removeFile("./TestRepos3/testCA.p12");
}
- cout << "================= ca.exportCAasPKCS12('tralla', true); =================" << endl;
+ cout << "================= ca.exportCAasPKCS12('tralla', true); =================" << endl;
ba = ca.exportCAasPKCS12("tralla", true);
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testCAChain.p12");
pi.stat("./TestRepos3/testCAChain.p12");
@@ -152,33 +152,33 @@
if(pi.exists() && pi.size() > 5400)
{
cout << "Certificate exists" << endl;
-
+
path::removeFile("./TestRepos3/testCAChain.p12");
}
CA ca2("SUSEUserCA", "system", "./TestRepos3/");
- cout << "==================== ca.exportCertificate(PEM); ======================" << endl;
+ cout << "==================== ca.exportCertificate(PEM); ======================" << endl;
ba = ca2.exportCertificate("04:9528e1d8783f83b662fca6085a8c1467-1111161258", E_PEM);
-
+
cd = LocalManagement::getCertificate(ba, E_PEM);
cout << "Subject: " << cd.getSubjectDN().getOpenSSLString() << endl;
- cout << "==================== ca.exportCertificate(DER); ======================" << endl;
+ cout << "==================== ca.exportCertificate(DER); ======================" << endl;
ba = ca2.exportCertificate("04:9528e1d8783f83b662fca6085a8c1467-1111161258", E_DER);
-
+
cd = LocalManagement::getCertificate(ba, E_DER);
cout << "Subject: " << cd.getSubjectDN().getOpenSSLString() << endl;
- cout << "================== ca.exportCertificateKeyAsPEM(decr); ===================" << endl;
+ cout << "================== ca.exportCertificateKeyAsPEM(decr); ===================" << endl;
ba = ca2.exportCertificateKeyAsPEM("04:9528e1d8783f83b662fca6085a8c1467-1111161258",
"system", "");
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testKey.key");
pi.stat("./TestRepos3/testKey.key");
@@ -186,11 +186,11 @@
if(pi.exists())
{
cout << "Key exists" << endl;
-
+
if(!r.match(blocxx::String(ba.data(), ba.size())))
{
cout << "Key is decrypted" << endl;
-
+
path::removeFile("./TestRepos3/testKey.key");
}
@@ -200,11 +200,11 @@
}
}
- cout << "============ ca.exportexportCertificateKeyAsPEM('tralla'); =============" << endl;
+ cout << "============ ca.exportexportCertificateKeyAsPEM('tralla'); =============" << endl;
ba = ca2.exportCertificateKeyAsPEM("04:9528e1d8783f83b662fca6085a8c1467-1111161258",
"system", "tralla");
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testKey2.key");
pi.stat("./TestRepos3/testKey2.key");
@@ -212,11 +212,11 @@
if(pi.exists())
{
cout << "Key exists" << endl;
-
+
if(!r.match(blocxx::String(ba.data(), ba.size())))
{
cout << "Key is decrypted" << endl;
-
+
}
else
{
@@ -226,11 +226,11 @@
}
}
- cout << "==================== ca.exportCertificateKeyAsDER(); ======================" << endl;
+ cout << "==================== ca.exportCertificateKeyAsDER(); ======================" << endl;
ba = ca2.exportCertificateKeyAsDER("04:9528e1d8783f83b662fca6085a8c1467-1111161258",
"system");
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testKeyDER.key");
pi.stat("./TestRepos3/testKeyDER.key");
@@ -238,15 +238,15 @@
if(pi.exists() && pi.size() > 1000)
{
cout << "Key exists" << endl;
-
+
path::removeFile("./TestRepos3/testKeyDER.key");
}
- cout << "============= ca.exportCertificateAsPKCS12(..., false); ==================" << endl;
+ cout << "============= ca.exportCertificateAsPKCS12(..., false); ==================" << endl;
ba = ca2.exportCertificateAsPKCS12("04:9528e1d8783f83b662fca6085a8c1467-1111161258",
"system", "tralla", false);
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testCert.p12");
pi.stat("./TestRepos3/testCert.p12");
@@ -254,15 +254,15 @@
if(pi.exists() && pi.size() > 2500)
{
cout << "Certificate exists" << endl;
-
+
path::removeFile("./TestRepos3/testCert.p12");
}
-
- cout << "=============== ca.exportCertificateAsPKCS12(..., true); ================" << endl;
+
+ cout << "=============== ca.exportCertificateAsPKCS12(..., true); ================" << endl;
ba = ca2.exportCertificateAsPKCS12("04:9528e1d8783f83b662fca6085a8c1467-1111161258",
"system", "tralla", true);
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testCertChain.p12");
pi.stat("./TestRepos3/testCertChain.p12");
@@ -270,22 +270,22 @@
if(pi.exists() && pi.size() > 5400)
{
cout << "Certificate exists" << endl;
-
+
path::removeFile("./TestRepos3/testCertChain.p12");
}
-
- cout << "==================== ca.exportCRL(PEM); ======================" << endl;
-
+
+ cout << "==================== ca.exportCRL(PEM); ======================" << endl;
+
ba = ca2.exportCRL(E_PEM);
-
+
CRLData crl = LocalManagement::getCRL(ba, E_PEM);
cout << "Issuer: " << crl.getIssuerDN().getOpenSSLString() << endl;
- cout << "==================== ca.exportCRL(DER); ======================" << endl;
-
+ cout << "==================== ca.exportCRL(DER); ======================" << endl;
+
ba = ca2.exportCRL(E_DER);
-
+
crl = LocalManagement::getCRL(ba, E_DER);
cout << "Issuer: " << crl.getIssuerDN().getOpenSSLString() << endl;
@@ -296,7 +296,7 @@
{
cerr << e << endl;
}
-
+
return 0;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc Sat Jun 12 14:33:19 2010
@@ -25,7 +25,7 @@
try
{
cout << "START" << endl;
-
+
blocxx::StringArray cat;
cat.push_back("FATAL");
cat.push_back("ERROR");
@@ -40,12 +40,12 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
cout << "=================== start Test ======================" << endl;
ValueCheck check = initIP6Check();
- blocxx::StringArray iparr ;
+ std::vectorblocxx::String iparr ;
iparr.push_back("2001:780:101:a00:211:11ff:fee6:a5af");
iparr.push_back("fe80::211:11ff:fee6:a5af");
iparr.push_back("2001::a5af");
@@ -68,7 +68,7 @@
cout << *ip_it << " => is not valid" << endl;
}
}
-
+
cout << "DONE" << endl;
}
catch(Exception& e)
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc Sat Jun 12 14:33:19 2010
@@ -41,14 +41,14 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
CA ca2("SUSEUserCA", "system", "./TestRepos3/");
-
- cout << "============ ca.exportCertificateAsPKCS12(..., false); ===========" << endl;
-
+
+ cout << "============ ca.exportCertificateAsPKCS12(..., false); ===========" << endl;
+
ByteBuffer ba = ca2.exportCertificateAsPKCS12("04:9528e1d8783f83b662fca6085a8c1467-1111161258",
"system", "tralla", false);
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testCert.p12");
path::PathInfo pi("./TestRepos3/testCert.p12");
@@ -56,8 +56,8 @@
{
cout << "Certificate exists" << endl;
}
-
- cout << "================= importAsLocalCertificate() ==================" << endl;
+
+ cout << "================= importAsLocalCertificate() ==================" << endl;
LocalManagement::importAsLocalCertificate(ba,
"tralla",
@@ -99,11 +99,11 @@
path::removeFile("./TestRepos3/testCert.p12");
- cout << "============ ca.exportCertificateAsPKCS12(..., true); ============" << endl;
+ cout << "============ ca.exportCertificateAsPKCS12(..., true); ============" << endl;
ba = ca2.exportCertificateAsPKCS12("04:9528e1d8783f83b662fca6085a8c1467-1111161258",
"system", "tralla", true);
-
+
LocalManagement::writeFile(ba, "./TestRepos3/testCertChain.p12");
pi.stat("./TestRepos3/testCertChain.p12");
@@ -112,32 +112,32 @@
cout << "Certificate exists" << endl;
}
- cout << "================ importAsLocalCertificate(Chain) ==================" << endl;
+ cout << "================ importAsLocalCertificate(Chain) ==================" << endl;
LocalManagement::importAsLocalCertificate(pi.toString(),
"tralla",
"./TestRepos3/localTest/certs2/",
"./TestRepos3/localTest/servercerts/servercert2.pem",
"./TestRepos3/localTest/servercerts/serverkey2.pem");
-
+
pi.stat("./TestRepos3/localTest/servercerts/servercert2.pem");
if(pi.exists())
{
cout << "servercert.pem exists" << endl;
}
-
+
pi.stat("./TestRepos3/localTest/servercerts/serverkey2.pem");
if(pi.exists() && pi.hasPerm(0600))
{
cout << "serverkey.pem exists and has permissions 0600" << endl;
}
-
+
pi.stat("./TestRepos3/localTest/certs2/YaST-CA.pem");
if(pi.exists())
{
cout << "CA exists" << endl;
}
-
+
pi.stat("./TestRepos3/localTest/certs2/YaST-CA-0.pem");
if(pi.exists())
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc Sat Jun 12 14:33:19 2010
@@ -23,7 +23,7 @@
try
{
cout << "START" << endl;
-
+
blocxx::StringArray cat;
cat.push_back("FATAL");
cat.push_back("ERROR");
@@ -38,14 +38,14 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
cout << "=================== start ImportRequestTest ======================" << endl;
{
CA ca("Test_CA1", "system", "./TestRepos/");
blocxx::String name = ca.importRequest(blocxx::String("./TestRepos/importRequestTest.req"),
E_PEM);
-
+
path::PathInfo pi("./TestRepos/Test_CA1/req/" + name + ".req");
if(pi.exists())
{
@@ -56,7 +56,7 @@
name = ca.importRequest(blocxx::String("./TestRepos/c293624b6a877f401407ce8f8f1f327e.req"),
E_PEM);
-
+
path::PathInfo pi2("./TestRepos/Test_CA1/req/" + name + ".req");
if(pi2.exists())
{
@@ -66,7 +66,7 @@
name = ca.importRequest(blocxx::String("./TestRepos/importRequestTest-DER.req"),
E_DER);
-
+
path::PathInfo pi3("./TestRepos/Test_CA1/req/" + name + ".req");
if(pi3.exists())
{
@@ -75,7 +75,7 @@
}
cout << "=================== end ImportRequestTest ========================" << endl;
-
+
cout << "DONE" << endl;
}
catch(blocxx::Exception& e)
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc Sat Jun 12 14:33:19 2010
@@ -22,7 +22,7 @@
try
{
cout << "START" << endl;
-
+
// Logging
LoggerRef l = ca_mgm::Logger::createCerrLogger(
"ListCATreeTest",
@@ -31,15 +31,15 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
cout << "=================== start CA Tree List ======================" << endl;
- std::listblocxx::String > tree = CA::getCATree("./TestRepos3/");
- std::listblocxx::String >::const_iterator it_ext;
+ std::listblocxx::String > tree = CA::getCATree("./TestRepos3/");
+ std::listblocxx::String >::const_iterator it_ext;
for(it_ext = tree.begin(); it_ext != tree.end(); ++it_ext)
{
- Arrayblocxx::String::const_iterator it_int;
+ std::vectorblocxx::String::const_iterator it_int;
for(it_int = (*it_ext).begin(); it_int != (*it_ext).end(); ++it_int)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc?rev=2669&r1=2668&r2=2669&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc Sat Jun 12 14:33:19 2010
@@ -14,6 +14,9 @@
#include <fstream>
#include
+// FIXME: need to be removed
+#include
+
using namespace blocxx;
using namespace ca_mgm;
@@ -24,7 +27,7 @@
try
{
cout << "START" << endl;
-
+
blocxx::StringArray cat;
cat.push_back("FATAL");
cat.push_back("ERROR");
@@ -39,15 +42,15 @@
"%-5p %c - %m"
);
ca_mgm::Logger::setDefaultLogger(l);
-
+
cout << "=================== start getRequestList ======================" << endl;
{
CA ca("Test_CA2", "system", "./TestRepos/");
- Array