Author: mcalmer Date: Sat Jun 12 15:33:41 2010 New Revision: 2671 URL: http://svn.opensuse.org/viewcvs/limal?rev=2671&view=rev Log: blocxx int types to standard int types Modified: 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/CRLData.cpp limal-branches/mc-devel/limal-ca-mgm/src/CRLDataImpl.hpp limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.hpp limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp limal-branches/mc-devel/limal-ca-mgm/src/CertificateDataImpl.hpp limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.cpp limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.hpp 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/DNObjectImpl.hpp limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.hpp limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.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/PathName.cpp limal-branches/mc-devel/limal-ca-mgm/src/RequestData.cpp limal-branches/mc-devel/limal-ca-mgm/src/RequestDataImpl.hpp limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.hpp limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp limal-branches/mc-devel/limal-ca-mgm/src/ValueIntCheck.cpp limal-branches/mc-devel/limal-ca-mgm/src/ValuePerlRECheck.cpp limal-branches/mc-devel/limal-ca-mgm/src/ValuePosixRECheck.cpp limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp limal-branches/mc-devel/limal-ca-mgm/src/limal/Logger.hpp limal-branches/mc-devel/limal-ca-mgm/src/limal/ValueIntCheck.hpp limal-branches/mc-devel/limal-ca-mgm/src/limal/ValuePerlRECheck.hpp limal-branches/mc-devel/limal-ca-mgm/src/limal/ValuePosixRECheck.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/CRLData.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/CertificateData.hpp limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificatePoliciesExtension.hpp limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CommonData.hpp limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/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/testsuite/TestRepos/Test_CA1/cam.txt limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Modified: limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp?rev=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -43,7 +43,7 @@ , pathlen(-1) {} - BasicConstraintsExtImpl(bool isCA, blocxx::Int32 pathLength) + BasicConstraintsExtImpl(bool isCA, int32_t pathLength) : ca(isCA) , pathlen(pathLength) {} @@ -60,7 +60,7 @@ } bool ca; - blocxx::Int32 pathlen; + int32_t pathlen; }; @@ -86,7 +86,7 @@ if(p) { bool isCA = false; - blocxx::Int32 pl = -1; + int32_t pl = -1; std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*") .split(caConfig->getValue(type2Section(type, true), "basicConstraints"))); @@ -108,7 +108,7 @@ setPresent(p); } -BasicConstraintsExt::BasicConstraintsExt(bool isCa, blocxx::Int32 pathLength) +BasicConstraintsExt::BasicConstraintsExt(bool isCa, int32_t pathLength) : ExtensionBase() , m_impl(new BasicConstraintsExtImpl(isCa, pathLength)) { @@ -136,7 +136,7 @@ } void -BasicConstraintsExt::setBasicConstraints(bool isCa, blocxx::Int32 pathLength) +BasicConstraintsExt::setBasicConstraints(bool isCa, int32_t pathLength) { m_impl->ca = isCa; m_impl->pathlen = pathLength; @@ -155,7 +155,7 @@ return m_impl->ca; } -blocxx::Int32 +int32_t BasicConstraintsExt::getPathLength() const { if(!isPresent()) 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -41,7 +41,7 @@ : value(0) {} - BitExtensionImpl(blocxx::UInt32 val) + BitExtensionImpl(uint32_t val) : value(val) {} @@ -57,7 +57,7 @@ return new BitExtensionImpl(*this); } - blocxx::UInt32 value; + uint32_t value; }; @@ -69,7 +69,7 @@ , m_impl(new BitExtensionImpl()) {} -BitExtension::BitExtension(blocxx::UInt32 value) +BitExtension::BitExtension(uint32_t value) : ExtensionBase() , m_impl(new BitExtensionImpl(value)) {} @@ -94,13 +94,13 @@ } void -BitExtension::setValue(blocxx::UInt32 value) +BitExtension::setValue(uint32_t value) { m_impl->value = value; setPresent(true); // ?? } -blocxx::UInt32 +uint32_t BitExtension::getValue() const { if(!isPresent()) @@ -135,7 +135,7 @@ bool p = caConfig->exists(type2Section(type, true), "keyUsage"); if(p) { - blocxx::UInt32 keyUsage = 0; + uint32_t keyUsage = 0; String ku = caConfig->getValue(type2Section(type, true), "keyUsage"); std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*").split(ku)); @@ -163,7 +163,7 @@ setPresent(p); } -KeyUsageExt::KeyUsageExt(blocxx::UInt32 keyUsage) +KeyUsageExt::KeyUsageExt(uint32_t keyUsage) : BitExtension(keyUsage) { if(!validKeyUsage(keyUsage)) @@ -193,7 +193,7 @@ } void -KeyUsageExt::setKeyUsage(blocxx::UInt32 keyUsage) +KeyUsageExt::setKeyUsage(uint32_t keyUsage) { if(!validKeyUsage(keyUsage)) { @@ -204,7 +204,7 @@ setPresent(true); } -blocxx::UInt32 +uint32_t KeyUsageExt::getKeyUsage() const { if(!isPresent()) @@ -341,9 +341,9 @@ bool -KeyUsageExt::validKeyUsage(blocxx::UInt32 keyUsage) const +KeyUsageExt::validKeyUsage(uint32_t keyUsage) const { - UInt32 mask = 0x80FF; + uint32_t mask = 0x80FF; if( (keyUsage&mask) != keyUsage || keyUsage == 0) { return false; @@ -375,7 +375,7 @@ bool p = caConfig->exists(type2Section(type, true), "nsCertType"); if(p) { - blocxx::UInt32 bits = 0; + uint32_t bits = 0; String ct = caConfig->getValue(type2Section(type, true), "nsCertType"); std::vectorblocxx::String sp = convStringArray(PerlRegEx("\\s*,\\s*").split(ct)); @@ -401,7 +401,7 @@ setPresent(p); } -NsCertTypeExt::NsCertTypeExt(blocxx::UInt32 nsCertTypes) +NsCertTypeExt::NsCertTypeExt(uint32_t nsCertTypes) : BitExtension(nsCertTypes) { if(nsCertTypes > 0xFF || nsCertTypes == 0) @@ -431,7 +431,7 @@ } void -NsCertTypeExt::setNsCertType(blocxx::UInt32 nsCertTypes) +NsCertTypeExt::setNsCertType(uint32_t nsCertTypes) { if(nsCertTypes > 0xFF || nsCertTypes == 0) { @@ -442,7 +442,7 @@ setPresent(true); } -blocxx::UInt32 +uint32_t NsCertTypeExt::getNsCertType() const { if(!isPresent()) 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -137,7 +137,7 @@ return *this; } -blocxx::Int32 +int32_t CRLData::getVersion() const { return m_impl->version; Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLDataImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CRLDataImpl.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CRLDataImpl.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CRLDataImpl.hpp Sat Jun 12 15:33:41 2010 @@ -104,7 +104,7 @@ return new CRLDataImpl(*this); } - blocxx::Int32 version; + int32_t version; String fingerprint; time_t lastUpdate; time_t nextUpdate; 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -211,7 +211,7 @@ {} void -CRLData_Priv::setVersion(blocxx::Int32 version) +CRLData_Priv::setVersion(int32_t version) { m_impl->version = version; } Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.hpp Sat Jun 12 15:33:41 2010 @@ -62,7 +62,7 @@ virtual ~CRLData_Priv(); void - setVersion(blocxx::Int32 version); + setVersion(int32_t version); void setFingerprint(const String& fp); 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -43,7 +43,7 @@ , extensions(X509v3CRLGenerationExts()) {} - CRLGenerationDataImpl(blocxx::UInt32 hours, + CRLGenerationDataImpl(uint32_t hours, const X509v3CRLGenerationExts& ext) : crlHours(hours) , extensions(ext) @@ -62,7 +62,7 @@ return new CRLGenerationDataImpl(*this); } - blocxx::UInt32 crlHours; + uint32_t crlHours; X509v3CRLGenerationExts extensions; }; @@ -79,7 +79,7 @@ m_impl->crlHours = caConfig->getValue(type2Section(type, false), "default_crl_hours").toUInt32(); } -CRLGenerationData::CRLGenerationData(blocxx::UInt32 hours, +CRLGenerationData::CRLGenerationData(uint32_t hours, const X509v3CRLGenerationExts& ext) : m_impl(new CRLGenerationDataImpl(hours, ext)) { @@ -109,12 +109,12 @@ } void -CRLGenerationData::setCRLLifeTime(blocxx::UInt32 hours) +CRLGenerationData::setCRLLifeTime(uint32_t hours) { m_impl->crlHours = hours; } -blocxx::UInt32 +uint32_t CRLGenerationData::getCRLLifeTime() const { return m_impl->crlHours; 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -54,7 +54,7 @@ return *this; } -blocxx::UInt32 +uint32_t CertificateData::getVersion() const { return m_impl->version; @@ -90,7 +90,7 @@ return m_impl->subject; } -blocxx::UInt32 +uint32_t CertificateData::getKeysize() const { return m_impl->keysize; Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateDataImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CertificateDataImpl.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CertificateDataImpl.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateDataImpl.hpp Sat Jun 12 15:33:41 2010 @@ -83,7 +83,7 @@ return new CertificateDataImpl(*this); } - blocxx::UInt32 version; // allowed 1, 2, 3 + uint32_t version; // allowed 1, 2, 3 String serial; String fingerprint; time_t notBefore; @@ -91,7 +91,7 @@ DNObject issuer; DNObject subject; - blocxx::UInt32 keysize; + uint32_t keysize; KeyAlg pubkeyAlgorithm; 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -76,7 +76,7 @@ } void -CertificateData_Priv::setVersion(blocxx::UInt32 v) +CertificateData_Priv::setVersion(uint32_t v) { m_impl->version = v; } @@ -126,7 +126,7 @@ } void -CertificateData_Priv::setKeysize(blocxx::UInt32 size) +CertificateData_Priv::setKeysize(uint32_t size) { m_impl->keysize = size; } Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.hpp Sat Jun 12 15:33:41 2010 @@ -53,7 +53,7 @@ virtual ~CertificateData_Priv(); void - setVersion(blocxx::UInt32 v); + setVersion(uint32_t v); void setSerial(const String& serial); @@ -68,7 +68,7 @@ setSubjectDN(const DNObject& subject); void - setKeysize(blocxx::UInt32 size); + setKeysize(uint32_t size); void setPublicKeyAlgorithm(KeyAlg pubKeyAlg); 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -81,7 +81,7 @@ { m_impl->notBefore = DateTime::getCurrent().get(); - UInt32 days = caConfig->getValue(type2Section(type, false), "default_days").toUInt32(); + uint32_t days = caConfig->getValue(type2Section(type, false), "default_days").toUInt32(); DateTime dt = DateTime(getStartDate()); dt.addDays(days); m_impl->notAfter = dt.get(); @@ -216,7 +216,7 @@ BLOCXX_THROW(ca_mgm::ValueException, Format(__("Wrong type: %1."), type).c_str()); } - UInt32 t = (UInt32)((getEndDate() - getStartDate())/(60*60*24)); + uint32_t t = (uint32_t)((getEndDate() - getStartDate())/(60*60*24)); ca.getConfig()->setValue(type2Section(type, false), "default_days", String(t)); 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -40,7 +40,7 @@ UserNoticeImpl() : explicitText("") , organization("") - , noticeNumbers(std::listblocxx::Int32()) + , noticeNumbers(std::list()) {} UserNoticeImpl(const UserNoticeImpl& impl) @@ -63,7 +63,7 @@ // (if included) must BOTH be present. String organization; // max 200 characters - std::listblocxx::Int32 noticeNumbers; + std::list noticeNumbers; }; @@ -225,7 +225,7 @@ void UserNotice::setOrganizationNotice(const String& org, - const std::listblocxx::Int32& numbers) + const std::list& numbers) { m_impl->organization = org; m_impl->noticeNumbers = numbers; @@ -237,14 +237,14 @@ return m_impl->organization; } -std::listblocxx::Int32 +std::list UserNotice::getNoticeNumbers() const { return m_impl->noticeNumbers; } blocxx::String -UserNotice::commit2Config(CA& ca, Type type, blocxx::UInt32 num) const +UserNotice::commit2Config(CA& ca, Type type, uint32_t num) const { if(!valid()) { @@ -275,7 +275,7 @@ ca.getConfig()->setValue(sectionName, "organization", m_impl->organization); String numbers; - std::listblocxx::Int32::const_iterator it = m_impl->noticeNumbers.begin(); + std::list::const_iterator it = m_impl->noticeNumbers.begin(); for(;it != m_impl->noticeNumbers.end(); ++it) { numbers += String(*it)+","; @@ -333,7 +333,7 @@ result.push_back("organization = " + m_impl->organization); String n; - std::list< blocxx::Int32 >::const_iterator it = m_impl->noticeNumbers.begin(); + std::list< int32_t >::const_iterator it = m_impl->noticeNumbers.begin(); for(; it != m_impl->noticeNumbers.end(); ++it) { n += String(*it) + " "; @@ -503,7 +503,7 @@ } blocxx::String -CertificatePolicy::commit2Config(CA& ca, Type type, blocxx::UInt32 num) const +CertificatePolicy::commit2Config(CA& ca, Type type, uint32_t num) const { if(!valid()) { @@ -531,13 +531,13 @@ ca.getConfig()->setValue(sectionName, "policyIdentifier", m_impl->policyIdentifier); StringList::const_iterator it = m_impl->cpsURI.begin(); - for(blocxx::UInt32 i = 1;it != m_impl->cpsURI.end(); ++it, ++i) + for(uint32_t i = 1;it != m_impl->cpsURI.end(); ++it, ++i) { ca.getConfig()->setValue(sectionName, "CPS."+String(i),(*it)); } std::list<UserNotice>::const_iterator nit = m_impl->noticeList.begin(); - for(blocxx::UInt32 j = 1;nit != m_impl->noticeList.end(); ++nit, ++j) + for(uint32_t j = 1;nit != m_impl->noticeList.end(); ++nit, ++j) { String n = (*nit).commit2Config(ca, type, j); ca.getConfig()->setValue(sectionName, "userNotice."+String(j),n); @@ -837,7 +837,7 @@ if(m_impl->ia5org) extString += "ia5org,"; std::list<CertificatePolicy>::const_iterator it = m_impl->policies.begin(); - for(blocxx::UInt32 i = 0;it != m_impl->policies.end(); ++it, ++i) + for(uint32_t i = 0;it != m_impl->policies.end(); ++it, ++i) { extString += (*it).commit2Config(ca, type, i) + ","; } Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp Sat Jun 12 15:33:41 2010 @@ -61,8 +61,8 @@ blocxx::String value; blocxx::String prompt; - blocxx::UInt32 min; - blocxx::UInt32 max; + uint32_t min; + uint32_t max; }; class DNObjectImpl : public blocxx::COWIntrusiveCountableBase 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -38,8 +38,8 @@ RDNObject_Priv::RDNObject_Priv(const String& type, const String& value, const String& prompt, - blocxx::UInt32 min, - blocxx::UInt32 max) + uint32_t min, + uint32_t max) : RDNObject() { m_impl->type = type; @@ -55,8 +55,8 @@ void RDNObject_Priv::setRDN(const String& type, const String& value, const String& prompt, - blocxx::UInt32 min, - blocxx::UInt32 max) + uint32_t min, + uint32_t max) { m_impl->type = type; m_impl->value = value; Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.hpp Sat Jun 12 15:33:41 2010 @@ -37,8 +37,8 @@ RDNObject_Priv(); RDNObject_Priv(const String& type, const String& value, const String& prompt = String(), - blocxx::UInt32 min = 0, - blocxx::UInt32 max = 0); + uint32_t min = 0, + uint32_t max = 0); virtual ~RDNObject_Priv(); @@ -53,8 +53,8 @@ */ void setRDN(const String& type, const String& value, const String& prompt = String(), - blocxx::UInt32 min = 0, - blocxx::UInt32 max = 0); + uint32_t min = 0, + uint32_t max = 0); }; 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -198,7 +198,7 @@ } blocxx::String -LiteralValue::commit2Config(CA &ca, Type t, blocxx::UInt32 num) const +LiteralValue::commit2Config(CA &ca, Type t, uint32_t num) const { if(m_impl->literalType == "email" || 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -86,7 +86,7 @@ void OpenSSLUtils::createRSAKey(const String &outFile, const String &password, - UInt32 bits, + uint32_t bits, const String &cryptAlgorithm) { blocxx::String debugCmd; @@ -265,7 +265,7 @@ const String &requestFile, const String &password, const String &extension, - UInt32 days, + uint32_t days, bool noEmailDN) { path::PathInfo pi(keyFile); @@ -623,7 +623,7 @@ OpenSSLUtils::issueCRL(const blocxx::String &caCertFile, const blocxx::String &caKeyFile, const blocxx::String &caPassword, - blocxx::UInt32 hours, + uint32_t hours, const blocxx::String &outfile, const blocxx::String &extension, bool noUniqueDN) 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -45,7 +45,7 @@ void createRSAKey(const blocxx::String &outFile, const blocxx::String &password, - blocxx::UInt32 bits = 2048, + uint32_t bits = 2048, const blocxx::String &cryptAlgorithm = "des3"); void createRequest(const DNObject &dn, @@ -62,7 +62,7 @@ const blocxx::String &requestFile, const blocxx::String &password, const blocxx::String &extension, - const blocxx::UInt32 days, + const uint32_t days, bool noEmailDN = false); void signRequest(const blocxx::String &requestFile, @@ -88,7 +88,7 @@ void issueCRL(const blocxx::String &caCertFile, const blocxx::String &caKeyFile, const blocxx::String &caPassword, - blocxx::UInt32 hours, + uint32_t hours, const blocxx::String &outfile, const blocxx::String &extension, bool noUniqueDN = false); Modified: limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp Sat Jun 12 15:33:41 2010 @@ -37,7 +37,6 @@ #include #include -#include #include #include @@ -432,18 +431,18 @@ PathName::List PathName::toList() const { - PathName::List list; + PathName::List list; if( m_name.empty()) return list; list.push_back( prefix() ); - + DirStack stack; - + stack.split(m_name.c_str() + m_prefix); PathName::List temp( stack.getPathList() ); list.insert( list.end(), temp.begin(), temp.end() ); - return list; + return list; } 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -53,13 +53,13 @@ return *this; } -blocxx::UInt32 +uint32_t RequestData::getVersion() const { return m_impl->version; } -blocxx::UInt32 +uint32_t RequestData::getKeysize() const { return m_impl->keysize; Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestDataImpl.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/RequestDataImpl.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/RequestDataImpl.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/RequestDataImpl.hpp Sat Jun 12 15:33:41 2010 @@ -78,10 +78,10 @@ return new RequestDataImpl(*this); } - blocxx::UInt32 version; + uint32_t version; DNObject subject; - blocxx::UInt32 keysize; + uint32_t keysize; KeyAlg pubkeyAlgorithm; 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -77,13 +77,13 @@ void -RequestData_Priv::setVersion(blocxx::UInt32 v) +RequestData_Priv::setVersion(uint32_t v) { m_impl->version = v; } void -RequestData_Priv::setKeysize(blocxx::UInt32 size) +RequestData_Priv::setKeysize(uint32_t size) { m_impl->keysize = size; } Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.hpp Sat Jun 12 15:33:41 2010 @@ -42,8 +42,8 @@ RequestData_Priv(const RequestData_Priv& data); virtual ~RequestData_Priv(); - void setVersion(blocxx::UInt32 v); - void setKeysize(blocxx::UInt32 size); + void setVersion(uint32_t v); + void setKeysize(uint32_t size); void setSubjectDN(const DNObject dn); void setKeyAlgorithm(KeyAlg alg); void setPublicKey(const ByteBuffer key); 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -65,7 +65,7 @@ } DNObject subject; - blocxx::UInt32 keysize; + uint32_t keysize; // KeyAlg pubkeyAlgorithm; // at the beginning we only support rsa @@ -155,12 +155,12 @@ } void -RequestGenerationData::setKeysize(blocxx::UInt32 size) +RequestGenerationData::setKeysize(uint32_t size) { m_impl->keysize = size; } -blocxx::UInt32 +uint32_t RequestGenerationData::getKeysize() const { return m_impl->keysize; 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -1419,7 +1419,7 @@ { checkUrlData(port, "port number", config("rx_portnumber")); - blocxx::UInt16 pnum = port.toUInt16(); + uint16_t pnum = port.toUInt16(); valid = pnum >= 1; } catch( ... ) Modified: limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp Sat Jun 12 15:33:41 2010 @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include <list> Modified: limal-branches/mc-devel/limal-ca-mgm/src/ValueIntCheck.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/ValueIntCheck.cpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/ValueIntCheck.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/ValueIntCheck.cpp Sat Jun 12 15:33:41 2010 @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -50,8 +50,8 @@ // ------------------------------------------------------------------- -ValueIntCheck::ValueIntCheck(blocxx::UInt64 minValue, - blocxx::UInt64 maxValue, +ValueIntCheck::ValueIntCheck(uint64_t minValue, + uint64_t maxValue, bool inclusiveRange) : ValueCheckBase() , m_sign(false) @@ -64,8 +64,8 @@ // ------------------------------------------------------------------- ValueIntCheck:: -ValueIntCheck::ValueIntCheck(blocxx::Int64 minValue, - blocxx::Int64 maxValue, +ValueIntCheck::ValueIntCheck(int64_t minValue, + int64_t maxValue, bool inclusiveRange) : ValueCheckBase() , m_sign(true) Modified: limal-branches/mc-devel/limal-ca-mgm/src/ValuePerlRECheck.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/ValuePerlRECheck.cpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/ValuePerlRECheck.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/ValuePerlRECheck.cpp Sat Jun 12 15:33:41 2010 @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include Modified: limal-branches/mc-devel/limal-ca-mgm/src/ValuePosixRECheck.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/ValuePosixRECheck.cpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/ValuePosixRECheck.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/ValuePosixRECheck.cpp Sat Jun 12 15:33:41 2010 @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -459,7 +459,7 @@ } int len = bit->length -1; - UInt32 ret = 0; + uint32_t ret = 0; for(; len >= 0; --len) { @@ -1052,7 +1052,7 @@ if(qualinfo->d.usernotice->noticeref) { NOTICEREF *ref; - std::listblocxx::Int32 numberList; + std::list numberList; ref = qualinfo->d.usernotice->noticeref; Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp Sat Jun 12 15:33:41 2010 @@ -196,7 +196,7 @@ } int len = bit->length -1; - UInt32 ret = 0; + uint32_t ret = 0; for(; len >= 0; --len) { 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -35,6 +35,7 @@ #include #include #include +#include /** @@ -407,8 +408,8 @@ const blocxx::StringArray &categories, const blocxx::String &messageFormat, const blocxx::String &filename, - blocxx::UInt64 maxLogFileSize = 0, - blocxx::UInt32 maxBackupIndex = 0 + uint64_t maxLogFileSize = 0, + uint32_t maxBackupIndex = 0 ); /** Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ValueIntCheck.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ValueIntCheck.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/limal/ValueIntCheck.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ValueIntCheck.hpp Sat Jun 12 15:33:41 2010 @@ -34,11 +34,12 @@ #define LIMAL_VALUE_INT_CHECK_HPP #include +#include #include -#include #include + namespace LIMAL_NAMESPACE { @@ -60,8 +61,8 @@ * @param inclusiveRange Whether to check if the value is * less (inclusiveRange=false) if less or equal the maxValue. */ - ValueIntCheck(blocxx::UInt64 minValue, - blocxx::UInt64 maxValue, + ValueIntCheck(uint64_t minValue, + uint64_t maxValue, bool inclusiveRange = true); /** @@ -72,8 +73,8 @@ * @param inclusiveRange Whether to check if the value is * less (inclusiveRange=false) if less or equal the maxValue. */ - ValueIntCheck(blocxx::Int64 minValue, - blocxx::Int64 maxValue, + ValueIntCheck(int64_t minValue, + int64_t maxValue, bool inclusiveRange = true); /** @@ -126,12 +127,12 @@ bool m_sign; bool m_incl; union { - blocxx::Int64 s; - blocxx::UInt64 u; + int64_t s; + uint64_t u; } m_min; union { - blocxx::Int64 s; - blocxx::UInt64 u; + int64_t s; + uint64_t u; } m_max; }; Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ValuePerlRECheck.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ValuePerlRECheck.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/limal/ValuePerlRECheck.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ValuePerlRECheck.hpp Sat Jun 12 15:33:41 2010 @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ValuePosixRECheck.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ValuePosixRECheck.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/limal/ValuePosixRECheck.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ValuePosixRECheck.hpp Sat Jun 12 15:33:41 2010 @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include @@ -43,7 +43,7 @@ * * The ValuePosixRECheck implements a simple posix regex * match check that can be used in ValueCheck. - */ + */ class ValuePosixRECheck: public ValueCheckBase { public: @@ -52,7 +52,7 @@ * used to validate a value. * * The match is case sensitive unless the icase flag is set. - * + * * @param regex Extended regular expression string. * @param icase Match case insensitive. * @throws blocxx::RegExCompileException on invalid pattern 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -44,7 +44,7 @@ public: BasicConstraintsExt(); BasicConstraintsExt(CAConfig* caConfig, Type type); - BasicConstraintsExt(bool isCa, blocxx::Int32 pathLength=-1); + BasicConstraintsExt(bool isCa, int32_t pathLength=-1); BasicConstraintsExt(const BasicConstraintsExt& extension); virtual ~BasicConstraintsExt(); @@ -61,7 +61,7 @@ * @param pathLength maximum number of CAs that can appear below this one in a chain; * -1 means no path Length is set. */ - void setBasicConstraints(bool isCa, blocxx::Int32 pathLength=-1); + void setBasicConstraints(bool isCa, int32_t pathLength=-1); /** * Return the ca parameter @@ -71,7 +71,7 @@ /** * Return the path length (-1 means no path length set) */ - blocxx::Int32 getPathLength() const; + int32_t getPathLength() const; /** * Write the informations of this object back to the configuration file 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -40,7 +40,7 @@ { public: BitExtension(); - BitExtension(blocxx::UInt32 value); + BitExtension(uint32_t value); BitExtension(const BitExtension& extension); virtual ~BitExtension(); @@ -50,8 +50,8 @@ #endif - void setValue(blocxx::UInt32 value); - blocxx::UInt32 getValue() const; + void setValue(uint32_t value); + uint32_t getValue() const; virtual void commit2Config(CA& ca, Type type) const = 0; @@ -89,7 +89,7 @@ /** * Create an object with a specific key usage set */ - KeyUsageExt(blocxx::UInt32 keyUsage); + KeyUsageExt(uint32_t keyUsage); KeyUsageExt(const KeyUsageExt& extension); virtual ~KeyUsageExt(); @@ -102,12 +102,12 @@ /** * Set a new key usage */ - void setKeyUsage(blocxx::UInt32 keyUsage); + void setKeyUsage(uint32_t keyUsage); /** * Return the key usage */ - blocxx::UInt32 getKeyUsage() const; + uint32_t getKeyUsage() const; /** * Return true if the specified bit is set @@ -144,7 +144,7 @@ virtual std::vectorblocxx::String dump() const; private: - bool validKeyUsage(blocxx::UInt32 keyUsage) const; + bool validKeyUsage(uint32_t keyUsage) const; }; /** @@ -170,7 +170,7 @@ /** * Create an object with a specific certificate type set */ - NsCertTypeExt(blocxx::UInt32 nsCertTypes); + NsCertTypeExt(uint32_t nsCertTypes); NsCertTypeExt(const NsCertTypeExt& extension); virtual ~NsCertTypeExt(); @@ -183,12 +183,12 @@ /** * Set a new certificate type */ - void setNsCertType(blocxx::UInt32 nsCertTypes); + void setNsCertType(uint32_t nsCertTypes); /** * Return the certificate type */ - blocxx::UInt32 getNsCertType() const; + uint32_t getNsCertType() const; /** * Return true if the specified bit is set 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -88,7 +88,7 @@ #endif - blocxx::Int32 + int32_t getVersion() const; String 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -42,7 +42,7 @@ public: CRLGenerationData(); CRLGenerationData(CAConfig* caConfig, Type type); - CRLGenerationData(blocxx::UInt32 hours, + CRLGenerationData(uint32_t hours, const X509v3CRLGenerationExts& ext); CRLGenerationData(const CRLGenerationData& data); virtual ~CRLGenerationData(); @@ -55,9 +55,9 @@ #endif void - setCRLLifeTime(blocxx::UInt32 hours); + setCRLLifeTime(uint32_t hours); - blocxx::UInt32 + uint32_t getCRLLifeTime() const; void 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -51,7 +51,7 @@ #endif - blocxx::UInt32 + uint32_t getVersion() const; String @@ -69,7 +69,7 @@ DNObject getSubjectDN() const; - blocxx::UInt32 + uint32_t getKeysize() const; KeyAlg 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -59,16 +59,16 @@ void setOrganizationNotice(const String& org, - const std::listblocxx::Int32& numbers); + const std::list& numbers); String getOrganization() const; - std::listblocxx::Int32 + std::list getNoticeNumbers() const; virtual blocxx::String - commit2Config(CA& ca, Type type, blocxx::UInt32 num) const; + commit2Config(CA& ca, Type type, uint32_t num) const; virtual bool valid() const; @@ -130,7 +130,7 @@ getUserNoticeList() const; virtual blocxx::String - commit2Config(CA& ca, Type type, blocxx::UInt32 num) const; + commit2Config(CA& ca, Type type, uint32_t num) const; virtual bool valid() const; Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CommonData.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CommonData.hpp?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CommonData.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CommonData.hpp Sat Jun 12 15:33:41 2010 @@ -22,12 +22,13 @@ #ifndef LIMAL_CA_MGM_COMMON_DATA_HPP #define LIMAL_CA_MGM_COMMON_DATA_HPP -#include + #include #include <list> #include <vector> #include <map> #include +#include #define REPOSITORY "/var/lib/CAM/" 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -118,7 +118,7 @@ * unsupported types like othername. */ blocxx::String - commit2Config(CA& ca, Type type, blocxx::UInt32 num) const; + commit2Config(CA& ca, Type type, uint32_t num) const; #ifndef SWIG 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -51,10 +51,10 @@ #endif - blocxx::UInt32 + uint32_t getVersion() const; - blocxx::UInt32 + uint32_t getKeysize() const; DNObject 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=2671&r1=2670&r2=2671&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 15:33:41 2010 @@ -69,9 +69,9 @@ subjectDN(); void - setKeysize(blocxx::UInt32 size); + setKeysize(uint32_t size); - blocxx::UInt32 + uint32_t getKeysize() const; void Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt Sat Jun 12 15:33:41 2010 @@ -1,14 +1,14 @@ -b4d4e48e6de644c953290eb2854a6ced-1276347200 /C=DE/CN=Test CA\/SUSE Inc.\\Gmbh/emailAddress=suse@suse.de -bc5324c7f5c2a27492fb6795745b596b-1276347202 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\Gmbh/emailAddress=suse@suse.de -40717a16174dc4d516f6fa7ee8eeb18c-1276347208 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -40717a16174dc4d516f6fa7ee8eeb18c-1276347211 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -40717a16174dc4d516f6fa7ee8eeb18c-1276347215 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -b4d4e48e6de644c953290eb2854a6ced-1276347223 /C=DE/CN=Test CA\/SUSE Inc.\\Gmbh/emailAddress=suse@suse.de -c293624b6a877f401407ce8f8f1f327e-1276347225 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de -b4d4e48e6de644c953290eb2854a6ced-1276347226 /C=DE/CN=Test CA\/SUSE Inc.\\Gmbh/emailAddress=suse@suse.de -c1943ae4b9bd7320fae3e29f217483e3-1276347227 /C=DE/CN=Test Request/emailAddress=suse@suse.de -d816690a832b0e52becd255d3a62e975-1276347231 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de -9198f6798d9da70d7cbfb67b610633f5-1276347234 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de -3e248858337c2b46dc67a0f9389376dd-1276347235 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de -bf04fdd95062554800c1556085f47063-1276347236 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de -9797ac11af29f94b82c1e5b0499ab5f2-1276347239 /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de +b4d4e48e6de644c953290eb2854a6ced-1276349522 /C=DE/CN=Test CA\/SUSE Inc.\\Gmbh/emailAddress=suse@suse.de +bc5324c7f5c2a27492fb6795745b596b-1276349524 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\Gmbh/emailAddress=suse@suse.de +40717a16174dc4d516f6fa7ee8eeb18c-1276349528 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +40717a16174dc4d516f6fa7ee8eeb18c-1276349531 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +40717a16174dc4d516f6fa7ee8eeb18c-1276349534 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +b4d4e48e6de644c953290eb2854a6ced-1276349542 /C=DE/CN=Test CA\/SUSE Inc.\\Gmbh/emailAddress=suse@suse.de +c293624b6a877f401407ce8f8f1f327e-1276349543 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de +b4d4e48e6de644c953290eb2854a6ced-1276349545 /C=DE/CN=Test CA\/SUSE Inc.\\Gmbh/emailAddress=suse@suse.de +c1943ae4b9bd7320fae3e29f217483e3-1276349546 /C=DE/CN=Test Request/emailAddress=suse@suse.de +d816690a832b0e52becd255d3a62e975-1276349550 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de +9198f6798d9da70d7cbfb67b610633f5-1276349554 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de +3e248858337c2b46dc67a0f9389376dd-1276349556 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de +bf04fdd95062554800c1556085f47063-1276349559 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de +9797ac11af29f94b82c1e5b0499ab5f2-1276349560 /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt Sat Jun 12 15:33:41 2010 @@ -1,11 +1,11 @@ -V 110612125321Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de -V 110612125322Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de -V 110612125326Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -V 110612125329Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -V 110612125332Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -R 110612125348Z 100612125351Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de -R 110612125351Z 100612125353Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de -R 110612125354Z 100612125355Z,keyTime,20100612143715Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de -R 110612125355Z 100612125356Z,CAkeyTime,20100612143716Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de -R 110612125356Z 100612125358Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de -V 120611125359Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de +V 110612133204Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de +V 110612133204Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de +V 110612133206Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +V 110612133209Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +V 110612133212Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +R 110612133228Z 100612133230Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de +R 110612133230Z 100612133233Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de +R 110612133234Z 100612133236Z,keyTime,20100612151556Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de +R 110612133236Z 100612133238Z,CAkeyTime,20100612151558Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de +R 110612133238Z 100612133239Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de +V 120611133240Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== Binary files - no diff available. Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem?rev=2671&r1=2670&r2=2671&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Sat Jun 12 15:33:41 2010 @@ -1,7 +1,7 @@ -----BEGIN X509 CRL----- MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX -DTEwMDYxMjEyNTQwMVoXDTEwMDYxMzEyNTQwMVowgfAwEgIBAxcNMDUwODE4MTQx +DTEwMDYxMjEzMzI0MloXDTEwMDYxMzEzMzI0MlowgfAwEgIBAxcNMDUwODE4MTQx MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud @@ -9,10 +9,10 @@ ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ -AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQBmESO4WjBX6adShcEE32BR7BvC -UO64mjLDLNEzWe9yaV0tdAy/BE0TCPaPpSY7KiE8cjGl5PJOADhu3IMjl9aYPHgr -gOgSa9Ae9GiLxCpmObZZ/MMu/8dBw5QXDrBYCh1xNZ5GTV3v+/p5nwZqe9qKOeyN -bfAVuDUksUAqYKiRGQXyp2nHf8XVGQWExoKCgH433z2NXqFn/Xcs2zB6it/9HDvA -KBkVBZDnNjWVr3jv9OZzNIy5STblKKTMJiSVHIyE1fBjaP6wEVLe7o0zl0u4F7+w -pDqMjDiVMbhGl+4cveq/aWuRl92Qvl0wJ2qO11bqHEqoYOTAGGxKXYdHVU6F +AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQBX/NdnQGnTnXoCUolvtVcY/Av3 +bkp8o8AXuNJ7UYndgqCF1Im5xT2c8ZVVftolb/ThgseCKbeFZJ3vMdkZOfqZuITh +jrbgYgmkUKohCsJG5NmvGIpdTRGszreVoVbWz7Gp25qSmUgq+7VGD6Zj2NwmNKFH +5YJfYdwRw2lsY0tfkNSlVqxO2XeBDqAqm2+4vLdPPpba2UfbiIoEF2LLKHT+43VP +kfwzB5tgngtab8AZ+5kFPlcbghxfYb1ajHF5LnCjb5kM3Xj6NP4t8bszM5omnKVf +ZTi4J99C7uShLnxYxN1Oh5u2QHOPvSlBLaLEfj8tbdOPzEmMheuGh/y0cgMb -----END X509 CRL----- -- To unsubscribe, e-mail: limal-commit+unsubscribe@opensuse.org For additional commands, e-mail: limal-commit+help@opensuse.org