Author: mcalmer Date: Sat Jul 10 18:47:47 2010 New Revision: 2685 URL: http://svn.opensuse.org/viewcvs/limal?rev=2685&view=rev Log: blocxx::Exception => ca_mgm::Exception 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/AuthorityKeyIdentifierExtension_Priv.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/ByteBuffer.cpp limal-branches/mc-devel/limal-ca-mgm/src/CA.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_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/Date.cpp limal-branches/mc-devel/limal-ca-mgm/src/Exception.cpp limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp 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/LiteralValues.cpp limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues_Priv.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/PathName.cpp limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp limal-branches/mc-devel/limal-ca-mgm/src/PerlRegEx.cpp limal-branches/mc-devel/limal-ca-mgm/src/PosixRegEx.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/UrlUtils.cpp limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.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/X509v3RequestExtensions_Priv.cpp limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp 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/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/DeleteCATest.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/ImportCATest.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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp Sat Jul 10 18:47:47 2010 @@ -103,12 +103,12 @@ if(!location.valid()) { LOGIT_ERROR("invalid location"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid location.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid location.")); } if(!initAccessOIDCheck().isValid(accessOID)) { LOGIT_ERROR("invalid accessOID"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid accessOID.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid accessOID.")); } } @@ -132,12 +132,12 @@ if(!location.valid()) { LOGIT_ERROR("invalid location"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid location.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid location.")); } if(!initAccessOIDCheck().isValid(accessOID)) { LOGIT_ERROR("invalid accessOID"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid accessOID.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid accessOID.")); } m_impl->accessOID = accessOID; @@ -252,7 +252,7 @@ type == E_CA_Req || type == E_CRL ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } bool p = caConfig->exists(type2Section(type, true), "authorityInfoAccess"); @@ -302,7 +302,7 @@ for(;it != infolist.end(); it++) { if(!(*it).valid()) { LOGIT_ERROR("invalid AuthorityInformation in infolist"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid AuthorityInformation in the information list.")); } } @@ -315,7 +315,7 @@ { if(!isPresent()) { LOGIT_ERROR("AuthorityInfoAccessExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("AuthorityInfoAccessExt is not present.")); } return m_impl->info; @@ -327,7 +327,7 @@ if(!valid()) { LOGIT_ERROR("invalid AuthorityInfoAccessExt object"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid AuthorityInfoAccessExt object.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid AuthorityInfoAccessExt object.")); } // These types are not supported by this object @@ -335,7 +335,7 @@ type == E_CA_Req || type == E_CRL ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } if(isPresent()) 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp Sat Jul 10 18:47:47 2010 @@ -90,7 +90,7 @@ { if(!isPresent()) { LOGIT_ERROR("AuthorityKeyIdentifierExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("AuthorityKeyIdentifierExt is not present.")); } return m_impl->keyid; @@ -101,7 +101,7 @@ { if(!isPresent()) { LOGIT_ERROR("AuthorityKeyIdentifierExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("AuthorityKeyIdentifierExt is not present.")); } return m_impl->DirName; @@ -112,7 +112,7 @@ { if(!isPresent()) { LOGIT_ERROR("AuthorityKeyIdentifierExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("AuthorityKeyIdentifierExt is not present.")); } return m_impl->serial; Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp Sat Jul 10 18:47:47 2010 @@ -64,12 +64,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, "Extension occurred more than once"); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form("Unable to parse the certificate (Crit: %d)", crit).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp Sat Jul 10 18:47:47 2010 @@ -79,7 +79,7 @@ if(type == E_Client_Req || type == E_Server_Req || type == E_CA_Req) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -147,7 +147,7 @@ if(!isPresent()) { LOGIT_ERROR("AuthorityKeyIdentifierGenerateExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("AuthorityKeyIdentifierGenerateExt is not present.")); } return m_impl->keyid; @@ -166,7 +166,7 @@ if(!isPresent()) { LOGIT_ERROR("AuthorityKeyIdentifierGenerateExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("AuthorityKeyIdentifierGenerateExt is not present.")); } return m_impl->issuer; @@ -178,7 +178,7 @@ if(!valid()) { LOGIT_ERROR("invalid AuthorityKeyIdentifierGenerateExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid AuthorityKeyIdentifierGenerateExt object.")); } @@ -186,7 +186,7 @@ if(type == E_Client_Req || type == E_Server_Req || type == E_CA_Req) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp Sat Jul 10 18:47:47 2010 @@ -77,7 +77,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -148,7 +148,7 @@ if(!isPresent()) { LOGIT_ERROR("BasicConstraintsExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("BasicConstraintsExt is not present.")); } return m_impl->ca; @@ -160,7 +160,7 @@ if(!isPresent()) { LOGIT_ERROR("BasicConstraintsExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("BasicConstraintsExt is not present.")); } return m_impl->pathlen; @@ -172,7 +172,7 @@ if(!valid()) { LOGIT_ERROR("invalid BasicConstraintsExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid BasicConstraintsExt object.")); } @@ -180,7 +180,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp Sat Jul 10 18:47:47 2010 @@ -104,7 +104,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("This BitExtension is not present.")); } return m_impl->value; @@ -127,7 +127,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %d."), type).c_str()); } @@ -167,7 +167,7 @@ { if(!validKeyUsage(keyUsage)) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for keyUsage.")); } setPresent(true); @@ -196,7 +196,7 @@ { if(!validKeyUsage(keyUsage)) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for keyUsage.")); } setValue(keyUsage); @@ -208,7 +208,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("KeyUsageExt is not present.")); } return getValue(); @@ -219,7 +219,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("KeyUsageExt is not present.")); } @@ -232,7 +232,7 @@ if(!valid()) { LOGIT_ERROR("invalid KeyUsageExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid KeyUsageExt object.")); } @@ -240,7 +240,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %d."), type).c_str()); } @@ -365,7 +365,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -403,7 +403,7 @@ { if(nsCertTypes > 0xFF || nsCertTypes == 0) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsCertTypeExt.")); } setPresent(true); @@ -432,7 +432,7 @@ { if(nsCertTypes > 0xFF || nsCertTypes == 0) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid value for NsCertTypeExt: %1."), nsCertTypes).c_str()); } setValue(nsCertTypes); @@ -444,7 +444,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("NsCertTypeExt is not present.")); } return getValue(); @@ -465,7 +465,7 @@ if(!valid()) { LOGIT_ERROR("invalid NsCertTypeExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid NsCertTypeExt object.")); } @@ -473,7 +473,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } Modified: limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp Sat Jul 10 18:47:47 2010 @@ -239,7 +239,7 @@ LOGIT_ERROR("ByteBuffer index out of bounds: size=" << size() << ", pos=" << pos); - BLOCXX_THROW(blocxx::OutOfBoundsException, str::form( + CA_MGM_THROW(blocxx::OutOfBoundsException, str::form( __("ByteBuffer index out of bounds: size=%1, pos=%2."), size(), pos).c_str()); } @@ -257,7 +257,7 @@ } else { - BLOCXX_THROW(ca_mgm::RuntimeException, __("ByteBuffer not initialized")); + CA_MGM_THROW(ca_mgm::RuntimeException, __("ByteBuffer not initialized")); } } } @@ -273,7 +273,7 @@ } else { - BLOCXX_THROW(ca_mgm::RuntimeException, __("ByteBuffer not initialized")); + CA_MGM_THROW(ca_mgm::RuntimeException, __("ByteBuffer not initialized")); } } @@ -289,7 +289,7 @@ LOGIT_ERROR("ByteBuffer index out of bounds: size=" << size() << ", pos=" << pos); - BLOCXX_THROW(blocxx::OutOfBoundsException, str::form( + CA_MGM_THROW(blocxx::OutOfBoundsException, str::form( __("ByteBuffer index out of bounds: size=%1, pos=%2."), size(), pos).c_str()); } @@ -306,7 +306,7 @@ LOGIT_ERROR("ByteBuffer index out of bounds: size=" << size() << ", pos=" << pos); - BLOCXX_THROW(blocxx::OutOfBoundsException, str::form( + CA_MGM_THROW(blocxx::OutOfBoundsException, str::form( __("ByteBuffer index out of bounds: size=%1, pos=%2."), size(), pos).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp Sat Jul 10 18:47:47 2010 @@ -97,7 +97,7 @@ { LOGIT_ERROR("template not initialized"); // exception - BLOCXX_THROW(ca_mgm::RuntimeException, __("Template not initialized.")); + CA_MGM_THROW(ca_mgm::RuntimeException, __("Template not initialized.")); } return ""; } @@ -167,14 +167,14 @@ if(caName.empty()) { LOGIT_ERROR("Empty CA name."); - BLOCXX_THROW(ca_mgm::ValueException, __("Empty CA name.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Empty CA name.")); } path::PathInfo pi(repos+"/"+caName+"/openssl.cnf.tmpl"); if(!pi.exists()) { LOGIT_ERROR("Template does not exists: " << pi.toString()); - BLOCXX_THROW_ERR(ca_mgm::SystemException, + CA_MGM_THROW_ERR(ca_mgm::SystemException, str::form(__("Template does not exist: %s."), pi.toString().c_str()).c_str(), E_FILE_NOT_FOUND); } @@ -186,7 +186,7 @@ if(!passOK) { LOGIT_ERROR("Invalid CA password"); - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, __("Invalid CA password."), E_INVALID_PASSWD); } @@ -227,10 +227,10 @@ { OpenSSLUtils::createCaInfrastructure(newCaName, m_impl->repositoryDir); } - catch(blocxx::Exception &e) + catch(Exception &e) { LOGIT_ERROR(e); - BLOCXX_THROW_SUBEX(ca_mgm::SystemException, + CA_MGM_THROW_SUBEX(ca_mgm::SystemException, __("Error while creating the CA infrastructure."), e); } @@ -250,7 +250,7 @@ LOGIT_ERROR("Can not parse certificate name: " << certificate); // %1 is the name of the CA - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("Cannot parse the certificate name %s."), certificate.c_str()).c_str()); } @@ -262,7 +262,7 @@ path::removeDirRecursive(m_impl->repositoryDir + "/" + newCaName); LOGIT_ERROR("Can not copy the private key." << r); - BLOCXX_THROW(ca_mgm::SystemException, __("Cannot copy the private key.")); + CA_MGM_THROW(ca_mgm::SystemException, __("Cannot copy the private key.")); } r = path::copyFile(m_impl->repositoryDir +"/"+ m_impl->caName +"/newcerts/"+ certificate +".pem", @@ -273,7 +273,7 @@ path::removeDirRecursive(m_impl->repositoryDir + "/" + newCaName); LOGIT_ERROR("Can not copy the certificate." << r); - BLOCXX_THROW(ca_mgm::SystemException, __("Cannot copy the certificate.")); + CA_MGM_THROW(ca_mgm::SystemException, __("Cannot copy the certificate.")); } r = path::copyFile(m_impl->repositoryDir + "/" + newCaName + "/" + "cacert.pem", @@ -305,7 +305,7 @@ if(!requestData.valid()) { LOGIT_ERROR("Invalid request data"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid request data.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid request data.")); } // copy template to config @@ -323,7 +323,7 @@ if(dKey.exists()) { LOGIT_ERROR("Duplicate DN. Key '" << request <<".key' already exists."); - BLOCXX_THROW(RuntimeException, + CA_MGM_THROW(RuntimeException, str::form(__("Duplicate DN. Key %s.key already exists."), request.c_str()).c_str()); } @@ -331,7 +331,7 @@ if(r.exists()) { LOGIT_ERROR("Duplicate DN. Request '" << request <<".req' already exists."); - BLOCXX_THROW(RuntimeException, + CA_MGM_THROW(RuntimeException, str::form(__("Duplicate DN. Request %s.req already exists."), request.c_str()).c_str()); } @@ -376,14 +376,14 @@ { LOGIT_ERROR("Request does not exist.(" << requestFile << ")"); // %1 is the absolute path to the request - BLOCXX_THROW(ValueException, + CA_MGM_THROW(ValueException, str::form(__("Request does not exist (%s)."), requestFile.c_str() ).c_str()); } if(!issueData.valid()) { LOGIT_ERROR("Invalid issue data"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid issue data.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid issue data.")); } std::string serial = OpenSSLUtils::nextSerial(m_impl->repositoryDir + "/" + m_impl->caName + "/serial"); @@ -399,7 +399,7 @@ LOGIT_ERROR("CA expires before the certificate should expire."); LOGIT_ERROR("CA expires: '" << cdata.getEndDate() << "' Cert should expire: '" << issueData.getEndDate()<< "'"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("The CA expires before the certificate should expire.")); } @@ -471,13 +471,13 @@ { certificate = issueCertificate(requestName, certificateData, t); } - catch(blocxx::Exception &e) + catch(Exception &e) { OpenSSLUtils::delCAM(m_impl->caName, requestName, m_impl->repositoryDir); path::removeFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" + requestName + ".key"); path::removeFile(m_impl->repositoryDir + "/" + m_impl->caName + "/req/" + requestName + ".req"); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Issuing the certificate failed."), e); } @@ -494,7 +494,7 @@ if(!pi.exists()) { LOGIT_ERROR("File '" << certificateName << ".pem' not found in repository"); - BLOCXX_THROW_ERR(ca_mgm::SystemException, + CA_MGM_THROW_ERR(ca_mgm::SystemException, str::form(__("File %s not found in the repository."), certificateName.c_str()).c_str(), E_FILE_NOT_FOUND); } @@ -502,7 +502,7 @@ if(!crlReason.valid()) { LOGIT_ERROR("Invalid CRL reason"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid CRL reason.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CRL reason.")); } // copy template to config @@ -525,7 +525,7 @@ if(!crlData.valid()) { LOGIT_ERROR("Invalid CRL data"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid CRL data.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CRL data.")); } // copy template to config @@ -570,7 +570,7 @@ if(outPi.exists()) { LOGIT_ERROR("Duplicate DN. Request already exists."); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Duplicate DN. Request already exists.")); } @@ -836,7 +836,7 @@ if(sa.size() != 2) { LOGIT_ERROR("Cannot parse certificate Name"); - BLOCXX_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name.")); } ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" + @@ -863,7 +863,7 @@ if(sa.size() != 2) { LOGIT_ERROR("Cannot parse certificate Name"); - BLOCXX_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name.")); } ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" + @@ -893,7 +893,7 @@ if(sa.size() != 2) { LOGIT_ERROR("Cannot parse certificate Name"); - BLOCXX_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name.")); } ByteBuffer caCert; @@ -944,7 +944,7 @@ if(!reqFile.exists()) { LOGIT_ERROR("Request '" << reqFile.toString() <<"' does not exist." ); - BLOCXX_THROW(ca_mgm::SystemException, str::form(__("Request %s does not exist."), + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Request %s does not exist."), reqFile.toString().c_str()).c_str()); } @@ -964,7 +964,7 @@ r = path::removeFile(reqFile.toString()); if(r != 0) { - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, // %1 is the error code str::form(__("Removing the request failed (%1)."), r).c_str()); } @@ -978,7 +978,7 @@ if(!certFile.exists()) { LOGIT_ERROR("Certificate does not exist." << certFile.toString()); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, // %s is the absolute path to the certificate str::form(__("Certificate %s does not exist."), certFile.toString().c_str()).c_str()); @@ -990,7 +990,7 @@ if(sa.size() != 3) { LOGIT_ERROR("Can not parse certificate name: " << certificateName); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, // %s is the certificate name str::form(__("Cannot parse the certificate name %s."), certificateName.c_str()).c_str()); } @@ -1027,7 +1027,7 @@ int r = path::removeFile(certFile.toString()); if(r != 0) { - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, // %2 is the error code of rm str::form(__("Removing the certificate failed: %d."), r).c_str()); } @@ -1036,7 +1036,7 @@ { LOGIT_ERROR("Only revoked or expired certificates can be deleted. " << str::form("The status of the certificate is '%s'.", state.c_str()).c_str()); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("Only revoked or expired certificates can be deleted. The status of the certificate is %s."), state.c_str()).c_str()); } } @@ -1049,7 +1049,7 @@ if(!db.exists()) { LOGIT_ERROR("Database not found."); - BLOCXX_THROW(ca_mgm::RuntimeException, __("Database not found.")); + CA_MGM_THROW(ca_mgm::RuntimeException, __("Database not found.")); } if(db.size() != 0) @@ -1075,7 +1075,7 @@ if(!certFile.exists()) { LOGIT_ERROR("Certificate does not exist"); - BLOCXX_THROW(ca_mgm::SystemException, __("Certificate does not exist.")); + CA_MGM_THROW(ca_mgm::SystemException, __("Certificate does not exist.")); } if(purpose != "sslclient" && @@ -1088,7 +1088,7 @@ purpose != "ocsphelper") { LOGIT_ERROR("Invalid purpose: " << purpose); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid purpose %s."), purpose.c_str()).c_str()); } @@ -1104,7 +1104,7 @@ if(!ret.empty()) { LOGIT_ERROR(ret); - BLOCXX_THROW(ca_mgm::RuntimeException, ret.c_str()); + CA_MGM_THROW(ca_mgm::RuntimeException, ret.c_str()); } return true; @@ -1132,13 +1132,13 @@ if(!caRequestData.valid()) { LOGIT_ERROR("Invalid CA request data"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid CA request data.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CA request data.")); } if(!caIssueData.valid()) { LOGIT_ERROR("Invalid CA issue data"); - BLOCXX_THROW(ca_mgm::ValueException, __("Invalid CA issue data.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CA issue data.")); } @@ -1148,10 +1148,10 @@ { OpenSSLUtils::createCaInfrastructure(caName, repos); } - catch(blocxx::Exception &e) + catch(Exception &e) { LOGIT_ERROR(e); - BLOCXX_THROW_SUBEX(ca_mgm::SystemException, + CA_MGM_THROW_SUBEX(ca_mgm::SystemException, __("Error while creating the CA infrastructure."), e); } @@ -1232,7 +1232,7 @@ if(caName.empty()) { LOGIT_ERROR("CA name is empty"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("CA name is empty.")); } @@ -1241,7 +1241,7 @@ if(caDir.exists()) { LOGIT_ERROR("CA directory already exists"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("CA directory already exists.")); } @@ -1252,14 +1252,14 @@ if(!bs.isPresent() || !bs.isCA()) { LOGIT_ERROR("According to 'basicConstraints', this is not a CA."); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("According to basicConstraints, this is not a CA.")); } if(caKey.empty()) { LOGIT_ERROR("CA key is empty"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("CA key is empty.")); } @@ -1268,14 +1268,14 @@ if(!keyregex.match(std::string(caKey.data(), caKey.size()))) { LOGIT_ERROR("Invalid Key data."); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid key data.")); } if(caPasswd.empty()) { LOGIT_ERROR("CA password is empty."); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("CA password is empty.")); } @@ -1291,10 +1291,10 @@ { OpenSSLUtils::createCaInfrastructure(caName, repos); } - catch(blocxx::Exception &e) + catch(Exception &e) { LOGIT_ERROR(e); - BLOCXX_THROW_SUBEX(ca_mgm::SystemException, + CA_MGM_THROW_SUBEX(ca_mgm::SystemException, __("Error while creating the CA infrastructure."), e); } @@ -1319,7 +1319,7 @@ path::removeDirRecursive(repos + "/" + caName); LOGIT_ERROR ("Error during key encryption." ); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Error during key encryption."), e); } @@ -1341,7 +1341,7 @@ path::removeDirRecursive(repos + "/" + caName); LOGIT_ERROR ("Error during write defaults." ); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Error during write defaults."), e); } @@ -1476,7 +1476,7 @@ if(caName.empty()) { LOGIT_ERROR("Empty CA name."); - BLOCXX_THROW(ca_mgm::ValueException, __("Empty CA name.")); + CA_MGM_THROW(ca_mgm::ValueException, __("Empty CA name.")); } path::PathInfo pi(repos + "/" + caName); @@ -1484,7 +1484,7 @@ if(!pi.exists()) { LOGIT_ERROR("CA name does not exist.(" << pi.toString() << ")"); - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, // %s is the absolute path name to the CA str::form(__("CA name does not exist (%s)."), pi.toString().c_str()).c_str(), E_FILE_NOT_FOUND); @@ -1497,7 +1497,7 @@ if(!ret) { LOGIT_ERROR("Invalid CA password"); - BLOCXX_THROW_ERR(ca_mgm::ValueException, __("Invalid CA password."), E_INVALID_PASSWD); + CA_MGM_THROW_ERR(ca_mgm::ValueException, __("Invalid CA password."), E_INVALID_PASSWD); } if(!force) @@ -1516,7 +1516,7 @@ { LOGIT_ERROR("Deleting the CA is not allowed. " << "The CA must be expired or no certificate was signed with this CA"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Deleting the CA is not allowed. The CA must be expired or never have signed a certificate.")); } else @@ -1540,7 +1540,7 @@ if( r != 0 ) { LOGIT_ERROR("Deleting the CA failed: " << r); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, // %1 is the error code of rm str::form(__("Deleting the CA failed: %1."), r).c_str()); } @@ -1585,14 +1585,14 @@ type == E_CA_Req || type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } bool p = m_impl->config->exists(type2Section(type, false), "policy"); if(!p) { LOGIT_ERROR("missing value 'policy' in config file"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("The configuration file is missing a value for policy.")); } std::string policySect = m_impl->config->getValue(type2Section(type, false), "policy"); @@ -1602,7 +1602,7 @@ if(policyKeys.empty()) { LOGIT_ERROR("Can not parse Section " << policySect); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Cannot parse section %s."), policySect.c_str()).c_str()); } StringList::const_iterator it = policyKeys.begin(); @@ -1674,7 +1674,7 @@ } LOGIT_ERROR("Field '" << *it << "' must have a value"); - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, str::form(__("Field %s must have a value."), (*it).c_str()).c_str(), errorCode); @@ -1713,7 +1713,7 @@ errorCode = E_EM_NF; } LOGIT_ERROR("The '" << *it << "' field must be defined."); - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, str::form(__("%s must be defined."), (*it).c_str()).c_str(), errorCode); } @@ -1798,7 +1798,7 @@ LOGIT_ERROR("The '"<<*it<<"' field needed to be the same in the CA certificate ("<< caMatchValue<<") and the request ("<< reqMatchValue <<")"); - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, str::form(__("%s must be the same in the CA certificate (%s) and the request (%s)."), (*it).c_str(), caMatchValue.c_str(), reqMatchValue.c_str()).c_str(), errorCode); @@ -1810,7 +1810,7 @@ if(!policyFound) { LOGIT_ERROR("Invalid policy in config file ? (" << *it << "/" << policyString << ")"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("The configuration file seems to have an invalid policy.")); } } @@ -1837,7 +1837,7 @@ else { LOGIT_ERROR("config not initialized"); - BLOCXX_THROW(ca_mgm::RuntimeException, __("The configuration is not initialized.")); + CA_MGM_THROW(ca_mgm::RuntimeException, __("The configuration is not initialized.")); } } @@ -1847,14 +1847,14 @@ if(!m_impl->config) { LOGIT_ERROR("config not initialized"); - BLOCXX_THROW(ca_mgm::RuntimeException, __("The configuration is not initialized.")); + CA_MGM_THROW(ca_mgm::RuntimeException, __("The configuration is not initialized.")); } bool p = m_impl->config->exists("req_ca", "distinguished_name"); if(!p) { LOGIT_ERROR("missing section 'distinguished_name' in config file"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("Missing section 'distinguished_name' in the configuration file.")); } std::string dnSect = m_impl->config->getValue("req_ca", "distinguished_name"); @@ -1864,7 +1864,7 @@ if(dnKeys.empty()) { LOGIT_ERROR("Can not parse Section " << dnSect); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Cannot parse section %s."), dnSect.c_str()).c_str()); } StringList::const_iterator it = dnKeys.begin(); 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp Sat Jul 10 18:47:47 2010 @@ -217,7 +217,7 @@ return (*(m_impl->revocationData.find(oid))).second; } LOGIT_ERROR("Entry not found: " << oid); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Entry not found.")); } 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=2685&r1=2684&r2=2685&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 Jul 10 18:47:47 2010 @@ -95,14 +95,14 @@ if(!initHexCheck().isValid(serial)) { LOGIT_ERROR("invalid serial: " << serial); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid serial %s."), serial.c_str()).c_str()); } std::vectorstd::string r = reason.verify(); if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } setSerial( serial ); setRevocationDate( revokeDate ); @@ -132,7 +132,7 @@ if(!initHexCheck().isValid(serial)) { LOGIT_ERROR("invalid serial: " << serial); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid serial %s."), serial.c_str()).c_str()); } m_impl->serial = serial; @@ -150,7 +150,7 @@ if(!reason.valid()) { LOGIT_ERROR("invalid CRL reason"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CRL reason.")); } m_impl->revocationReason = reason; @@ -214,7 +214,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->issuer = issuer; } @@ -238,7 +238,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->extensions = ext; } @@ -250,7 +250,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->revocationData = data; } @@ -351,7 +351,7 @@ else { LOGIT_ERROR("Unsupported signature algorithm: '" << sbuf << "'"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("Unsupported signature algorithm %s."), sbuf.c_str()).c_str()); } @@ -390,7 +390,7 @@ if(!bio) { LOGIT_ERROR("Can not create a memory BIO"); - BLOCXX_THROW(ca_mgm::MemoryException, + CA_MGM_THROW(ca_mgm::MemoryException, __("Cannot create a memory BIO.")); } @@ -418,7 +418,7 @@ if(m_impl->x509 == NULL) { LOGIT_ERROR("Can not parse CRL"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Cannot parse CRL.")); } @@ -431,7 +431,7 @@ X509_CRL_free(m_impl->x509); m_impl->x509 = NULL; - BLOCXX_THROW_SUBEX(ca_mgm::SyntaxException, + CA_MGM_THROW_SUBEX(ca_mgm::SyntaxException, __("Error parsing the CRL."), e); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp Sat Jul 10 18:47:47 2010 @@ -69,7 +69,7 @@ type == E_Server_Req || type == E_CA_Req ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -126,7 +126,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->altNameList = dp; setPresent(true); @@ -138,7 +138,7 @@ if(!isPresent()) { LOGIT_ERROR("CRLDistributionPointsExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("CRLDistributionPointsExt is not present.")); } return m_impl->altNameList; @@ -150,7 +150,7 @@ if(!valid()) { LOGIT_ERROR("invalid CRLDistributionPointsExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CRLDistributionPointsExt object.")); } @@ -159,7 +159,7 @@ type == E_Server_Req || type == E_CA_Req ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp Sat Jul 10 18:47:47 2010 @@ -85,7 +85,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } } @@ -125,7 +125,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->extensions = ext; } @@ -148,14 +148,14 @@ if(!valid()) { LOGIT_ERROR("invalid CRLGenerationData object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CRLGenerationData object.")); } // These types are not supported by this object if(type != E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %d."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp Sat Jul 10 18:47:47 2010 @@ -93,7 +93,7 @@ { if(!checkReason(reason)) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid revoke reason %s."), reason.c_str()).c_str()); } } @@ -128,7 +128,7 @@ { if(!checkReason(reason)) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, // %s is the wrong reason string str::form(__("Invalid revoke reason %s."), reason.c_str()).c_str()); } @@ -152,7 +152,7 @@ if(!r.empty()) { LOGIT_ERROR(r); - BLOCXX_THROW(ca_mgm::ValueException, r.c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r.c_str()); } m_impl->holdInstruction = holdInstruction; @@ -167,7 +167,7 @@ if(0 != str::compareCI(m_impl->reason, "certificateHold")) { LOGIT_ERROR("Reason is not certificateHold"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Reason is not certificateHold.")); } return m_impl->holdInstruction; @@ -190,7 +190,7 @@ if(0 != str::compareCI(m_impl->reason, "keyCompromise")) { LOGIT_ERROR("Reason is not keyCompromise"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Reason is not keyCompromise.")); } return m_impl->compromiseDate; @@ -204,7 +204,7 @@ if(0 != str::compareCI(m_impl->reason, "keyCompromise")) { LOGIT_ERROR("Reason is not keyCompromise"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Reason is not keyCompromise.")); } std::string time; @@ -235,7 +235,7 @@ if(0 != str::compareCI(m_impl->reason, "CACompromise")) { LOGIT_ERROR("Reason is not CACompromise"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Reason is not CACompromise.")); } return m_impl->compromiseDate; @@ -249,7 +249,7 @@ if(0 != str::compareCI(m_impl->reason, "CACompromise")) { LOGIT_ERROR("Reason is not CACompromise"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Reason is not CACompromise.")); } std::string time; 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=2685&r1=2684&r2=2685&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 Jul 10 18:47:47 2010 @@ -88,7 +88,7 @@ if(!initHexCheck().isValid(serial)) { LOGIT_ERROR("invalid serial: " << serial); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, // %1 is an invalid serial number str::form(__("Invalid serial %s."), serial.c_str()).c_str()); } @@ -109,7 +109,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->issuer = issuer; } @@ -121,7 +121,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->subject = subject; } @@ -163,7 +163,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->extensions = ext; } @@ -201,7 +201,7 @@ if(!bio) { LOGIT_ERROR("Can not create a memory BIO"); - BLOCXX_THROW(ca_mgm::MemoryException, + CA_MGM_THROW(ca_mgm::MemoryException, __("Cannot create a memory BIO.")); } @@ -230,7 +230,7 @@ if(m_impl->x509 == NULL) { LOGIT_ERROR("Can not parse certificate"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Cannot parse the certificate.")); } @@ -243,7 +243,7 @@ X509_free(m_impl->x509); m_impl->x509 = NULL; - BLOCXX_THROW_SUBEX(ca_mgm::SyntaxException, + CA_MGM_THROW_SUBEX(ca_mgm::SyntaxException, __("Error while parsing the certificate."), e); } @@ -270,7 +270,7 @@ if (BIO_printf(bioS,"%02x",bs->data[i]) <= 0) { LOGIT_ERROR("Can not parse serial."); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Cannot parse serial.")); } } @@ -338,7 +338,7 @@ if(pkey == NULL) { LOGIT_ERROR("Unable to get public key"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Unable to get the public key.")); } @@ -349,7 +349,7 @@ if(!rsa) { LOGIT_ERROR("could not get RSA key"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Could not get RSA key.")); } @@ -369,7 +369,7 @@ EVP_PKEY_free(pkey); LOGIT_ERROR("Unsupported public key type"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Unsupported public key type.")); } @@ -405,7 +405,7 @@ EVP_PKEY_free(pkey); LOGIT_ERROR("Unsupported public key algorithm"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Unsupported public key algorithm.")); } @@ -436,7 +436,7 @@ EVP_PKEY_free(pkey); LOGIT_ERROR("Unsupported signature algorithm: '" << sbuf << "'"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, // %s is the unsupported signature algorithm string str::form(__("Unsupported signature algorithm %s."), sbuf.c_str()).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp Sat Jul 10 18:47:47 2010 @@ -181,7 +181,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->extensions = ext; } @@ -204,7 +204,7 @@ if(!valid()) { LOGIT_ERROR("invalid CertificateIssueData object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CertificateIssueData object.")); } // These types are not supported by this object @@ -212,7 +212,7 @@ type == E_Server_Req || type == E_CA_Req) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %d."), type).c_str()); } uint32_t t = (uint32_t)((getEndDate() - getStartDate())/(60*60*24)); 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp Sat Jul 10 18:47:47 2010 @@ -160,7 +160,7 @@ type == E_Server_Req || type == E_CA_Req ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -207,7 +207,7 @@ if(text.length() > 200) { LOGIT_ERROR("The text is too long."); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("The text is too long.")); } @@ -246,7 +246,7 @@ if(!valid()) { LOGIT_ERROR("invalid UserNotice object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid UserNotice object.")); } @@ -255,7 +255,7 @@ type == E_Server_Req || type == E_CA_Req ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -385,7 +385,7 @@ if(!initOIDCheck().isValid(policyIdentifier)) { LOGIT_ERROR("invalid value for policyIdentifier" << policyIdentifier); - BLOCXX_THROW(ca_mgm::ValueException , + CA_MGM_THROW(ca_mgm::ValueException , // %s is the wrong string for policyIdentifier str::form(__("Invalid value for policyIdentifier: %s."), policyIdentifier.c_str()).c_str()); } @@ -416,7 +416,7 @@ type == E_Server_Req || type == E_CA_Req ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -450,7 +450,7 @@ if(!initOIDCheck().isValid(policyIdentifier)) { LOGIT_ERROR("invalid value for policyIdentifier" << policyIdentifier); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid value for policyIdentifier: %s."), policyIdentifier.c_str()).c_str()); } @@ -470,7 +470,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->cpsURI = cpsURI; } @@ -488,7 +488,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->noticeList = list; } @@ -505,7 +505,7 @@ if(!valid()) { LOGIT_ERROR("invalid CertificatePolicy object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CertificatePolicy object.")); } @@ -514,7 +514,7 @@ type == E_Server_Req || type == E_CA_Req ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -690,7 +690,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } setPresent(true); } @@ -704,7 +704,7 @@ type == E_Server_Req || type == E_CA_Req ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -774,7 +774,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("CertificatePoliciesExt is not present.")); } return m_impl->ia5org; @@ -787,7 +787,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->policies = policies; @@ -799,7 +799,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("CertificatePoliciesExt is not present.")); } return m_impl->policies; @@ -812,7 +812,7 @@ if(!valid()) { LOGIT_ERROR("invalid CertificatePoliciesExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CertificatePoliciesExt object.")); } @@ -821,7 +821,7 @@ type == E_Server_Req || type == E_CA_Req ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp Sat Jul 10 18:47:47 2010 @@ -103,7 +103,7 @@ else { LOGIT_ERROR("Invalid type:" << m_impl->type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, // %s is the invalid string for a DN type str::form(__("Invalid type %s."), m_impl->type.c_str()).c_str()); } @@ -249,7 +249,7 @@ type == E_CA_Cert || type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %d."), type).c_str()); } @@ -257,7 +257,7 @@ if(!p) { LOGIT_ERROR("missing section 'distinguished_name' in config file"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("Missing section 'distinguished_name' in the configuration file.")); } std::string dnSect = caConfig->getValue(type2Section(type, false), @@ -268,7 +268,7 @@ if(dnKeys.empty()) { LOGIT_ERROR("Can not parse Section " << dnSect); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Cannot parse section %s."), dnSect.c_str()).c_str()); } StringList::const_iterator it = dnKeys.begin(); @@ -368,7 +368,7 @@ std::vectorstd::string r = this->verify(); if(!r.empty()) { - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } } @@ -396,7 +396,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->dn = dn; } Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp?rev=2685&r1=2684&r2=2685&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 Jul 10 18:47:47 2010 @@ -75,7 +75,7 @@ if(!bio) { LOGIT_ERROR("Can not create a memory BIO"); - BLOCXX_THROW(ca_mgm::MemoryException, + CA_MGM_THROW(ca_mgm::MemoryException, __("Cannot create a memory BIO.")); } @@ -112,7 +112,7 @@ BIO_free(bio); LOGIT_ERROR("Can not parse DN line: " << lines[j]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form("Can not parse DN line: %1", lines[j]).c_str()); } @@ -153,7 +153,7 @@ BIO_free(bio); LOGIT_ERROR("Can not parse DN line: " << lines[j]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, // %1 is the wrong part of a DN which could not be parsed str::form(__("Cannot parse DN line: %s."), lines[j].c_str()).c_str()); } @@ -194,7 +194,7 @@ if(!p) { LOGIT_ERROR("missing section 'distinguished_name' in config file"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("Missing section 'distinguished_name' in the configuration file.")); } std::string dnSect = ca.getConfig()->getValue("req_ca", "distinguished_name"); @@ -204,7 +204,7 @@ if(dnKeys.empty()) { LOGIT_ERROR("Can not parse Section " << dnSect); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Cannot parse section %s."), dnSect.c_str()).c_str()); } StringList::const_iterator it = dnKeys.begin(); Modified: limal-branches/mc-devel/limal-ca-mgm/src/Date.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/Date.cpp?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/Date.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/Date.cpp Sat Jul 10 18:47:47 2010 @@ -66,7 +66,7 @@ restoreLocale(thisLocale); if (res == NULL) - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form( __("Invalid date format: '%s'"), date_str.c_str() ).c_str() ); } Modified: limal-branches/mc-devel/limal-ca-mgm/src/Exception.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/Exception.cpp?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/Exception.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/Exception.cpp Sat Jul 10 18:47:47 2010 @@ -1,11 +1,183 @@ #include +namespace +{ +char* dupString(const char* str) +{ + if (!str) + { + return 0; + } + char* rv = new (std::nothrow) char[strlen(str)+1]; + if (!rv) + { + return 0; + } + strcpy(rv, str); + return rv; +} +static void freeBuf(char** ptr) +{ + delete [] *ptr; + *ptr = NULL; +} +} + namespace LIMAL_NAMESPACE { - BLOCXX_DEFINE_EXCEPTION(Memory); - BLOCXX_DEFINE_EXCEPTION(Runtime); - BLOCXX_DEFINE_EXCEPTION(Overflow); - BLOCXX_DEFINE_EXCEPTION(Syntax); - BLOCXX_DEFINE_EXCEPTION(Value); - BLOCXX_DEFINE_EXCEPTION(System); + +Exception::Exception(const char* file, int line, const char* msg, int errorCode, const Exception* subException) + : std::exception() + , m_file(dupString(file)) + , m_line(line) + , m_msg(dupString(msg)) + , m_errorCode(errorCode) +{ + if( subException != NULL ) + { + try + { + m_msg = dupString(str::form("%s\n\t%s", m_msg, subException->getFullMessage().c_str()).c_str()); + } + catch (...) + {} + } +} + + Exception::Exception( const Exception& e ) + : std::exception(e) + , m_file(dupString(e.m_file)) + , m_line(e.m_line) + , m_msg(dupString(e.m_msg)) + , m_errorCode(e.m_errorCode) +{} + +Exception::~Exception() throw() +{ + try + { + freeBuf(&m_file); + freeBuf(&m_msg); + } + catch (...) + { + // don't let exceptions escape + } +} + +Exception& +Exception::operator=(const Exception& rhs) +{ + if(this == &rhs) return *this; + + m_file = rhs.m_file; + m_line = rhs.m_line; + m_msg = rhs.m_msg; + m_errorCode = rhs.m_errorCode; + + return *this; +} +////////////////////////////////////////////////////////////////////////////// +const char* +Exception::type() const +{ + return "Exception"; +} + +////////////////////////////////////////////////////////////////////////////// +int +Exception::getLine() const +{ + return m_line; +} + +////////////////////////////////////////////////////////////////////////////// +const char* +Exception::getMessage() const +{ + return (m_msg != NULL) ? m_msg : ""; +} +////////////////////////////////////////////////////////////////////////////// +std::string +Exception::getFullMessage() const +{ + try + { + return str::form("%s: %s %s: %s%s", + (getFile() == '\0')?"[no file]":getFile(), + (getLine() == 0)?"[no line]":str::numstring(getLine()).c_str(), + type(), + (getErrorCode() != 0)?(str::numstring(getErrorCode())+": ").c_str():" ", + (getMessage() == '\0')?"[no message]":getMessage() + ); + } + catch (...) + {} + return ""; +} +////////////////////////////////////////////////////////////////////////////// +const char* +Exception::getFile() const +{ + return (m_file != NULL) ? m_file : ""; +} +////////////////////////////////////////////////////////////////////////////// +std::ostream& +operator<<(std::ostream& os, const Exception& e) +{ + if (*e.getFile() == '\0') + { + os << "[no file]: "; + } + else + { + os << e.getFile() << ": "; + } + + if (e.getLine() == 0) + { + os << "[no line] "; + } + else + { + os << e.getLine() << ' '; + } + + os << e.type() << ": "; + + if (e.getErrorCode() != 0) + { + os << e.getErrorCode() << ": "; + } + + if (*e.getMessage() == '\0') + { + os << "[no message]"; + } + else + { + os << e.getMessage(); + } + return os; +} +////////////////////////////////////////////////////////////////////////////// +const char* +Exception::what() const throw() +{ + return getMessage(); +} +////////////////////////////////////////////////////////////////////////////// +int +Exception::getErrorCode() const +{ + return m_errorCode; +} + + + CA_MGM_DEFINE_EXCEPTION(Memory); + CA_MGM_DEFINE_EXCEPTION(Runtime); + CA_MGM_DEFINE_EXCEPTION(Overflow); + CA_MGM_DEFINE_EXCEPTION(Syntax); + CA_MGM_DEFINE_EXCEPTION(Value); + CA_MGM_DEFINE_EXCEPTION(System); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp Sat Jul 10 18:47:47 2010 @@ -70,7 +70,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -115,7 +115,7 @@ else { LOGIT_INFO("Unknown ExtendedKeyUsage option: " << (*it)); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid ExtendedKeyUsage option %s."), (*it).c_str()).c_str()); } @@ -123,7 +123,7 @@ if(m_impl->usage.empty()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid ExtendedKeyUsageExt.")); } @@ -164,7 +164,7 @@ else { LOGIT_INFO("Unknown ExtendedKeyUsage option: " << (*it)); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid ExtendedKeyUsage option %s."), (*it).c_str()).c_str()); } @@ -172,7 +172,7 @@ if(m_impl->usage.empty()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid ExtendedKeyUsageExt.")); } @@ -185,7 +185,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("ExtendedKeyUsageExt is not present.")); } return m_impl->usage; @@ -214,7 +214,7 @@ if(!valid()) { LOGIT_ERROR("invalid ExtendedKeyUsageExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid ExtendedKeyUsageExt object.")); } @@ -222,7 +222,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp Sat Jul 10 18:47:47 2010 @@ -78,7 +78,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } setPresent(true); } @@ -91,7 +91,7 @@ if(type == E_Client_Req || type == E_Server_Req || type == E_CA_Req) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -159,7 +159,7 @@ if(!isPresent()) { LOGIT_ERROR("IssuerAlternativeNameExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("IssuerAlternativeNameExt is not present.")); } return m_impl->issuerCopy; @@ -172,7 +172,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->altNameList = alternativeNameList; setPresent(true); @@ -184,7 +184,7 @@ if(!isPresent()) { LOGIT_ERROR("IssuerAlternativeNameExt is not present"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("IssuerAlternativeNameExt is not present.")); } return m_impl->altNameList; @@ -196,7 +196,7 @@ if(!altName.valid()) { LOGIT_ERROR("invalid literal value for IssuerAlternativeNameExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid literal value for IssuerAlternativeNameExt.")); } m_impl->altNameList.push_back(altName); @@ -209,7 +209,7 @@ if(!valid()) { LOGIT_ERROR("invalid IssuerAlternativeNameExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid IssuerAlternativeNameExt object.")); } @@ -217,7 +217,7 @@ if(type == E_Client_Req || type == E_Server_Req || type == E_CA_Req) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %d."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp Sat Jul 10 18:47:47 2010 @@ -100,7 +100,7 @@ } else { - BLOCXX_THROW(ca_mgm::url::UrlNotSupportedException, + CA_MGM_THROW(ca_mgm::url::UrlNotSupportedException, str::form(__("Unable to parse LDAP URL query string '%s'."), getQueryString().c_str()).c_str() ); @@ -141,7 +141,7 @@ } if( !found) { - BLOCXX_THROW(UrlNotSupportedException, + CA_MGM_THROW(UrlNotSupportedException, str::form(__("Invalid LDAP URL query parameter '%s'."), p->first.c_str()).c_str() ); 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp Sat Jul 10 18:47:47 2010 @@ -77,7 +77,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } } @@ -124,7 +124,7 @@ else { LOGIT_DEBUG("unknown type: "<< sp[1] << " = " << sp[2]); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Unknown type.")); } } @@ -164,7 +164,7 @@ m_impl->literalValue = dValue; LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } } @@ -181,7 +181,7 @@ m_impl->literalValue = dValue; LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } } Modified: limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues_Priv.cpp?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues_Priv.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues_Priv.cpp Sat Jul 10 18:47:47 2010 @@ -150,7 +150,7 @@ else { LOGIT_ERROR("Invalid IP Address"); - BLOCXX_THROW(ca_mgm::SyntaxException, "Invalid IP Address"); + CA_MGM_THROW(ca_mgm::SyntaxException, "Invalid IP Address"); break; } setLiteral("IP", oline); 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp Sat Jul 10 18:47:47 2010 @@ -88,7 +88,7 @@ if(dataList.size() <= 1) { LOGIT_ERROR("Cannot split certificate output"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Cannot split certificate output.")); } @@ -285,7 +285,7 @@ if(r != 0) { LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r)); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot create directory %s: %s."), pi.toString().c_str(), errno2String(r).c_str()).c_str()); @@ -306,7 +306,7 @@ if(r != 0) { LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r)); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot create directory %s: %s."), pi.toString().c_str(), errno2String(r).c_str()).c_str()); @@ -325,7 +325,7 @@ if(r != 0) { LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r)); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot create directory %s: %s."), pi.toString().c_str(), errno2String(r).c_str()).c_str()); @@ -339,7 +339,7 @@ if(!pi.isDir()) { LOGIT_ERROR( "'" << pi.toString() <<"' is not a directory"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("%s is not a directory."), pi.toString().c_str()).c_str()); } @@ -360,7 +360,7 @@ } else { LOGIT_ERROR("Invalid certificate file."); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("Invalid certificate file.")); } } @@ -438,7 +438,7 @@ if(!filePi.exists()) { LOGIT_ERROR("File not found: " << filePi.toString()); - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, str::form(__("File not found: %s."), filePi.toString().c_str()).c_str(), E_FILE_NOT_FOUND); @@ -447,7 +447,7 @@ if(filePi.size() > (1024*1024)) { LOGIT_ERROR("File too big: " << filePi.toString()); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("File too big: %s."), filePi.toString().c_str()).c_str()); } @@ -456,7 +456,7 @@ if(fd == -1) { LOGIT_ERROR("Cannot open file: " << file << "(" << errno << ")"); - BLOCXX_THROW_ERRNO_MSG1(ca_mgm::SystemException, + CA_MGM_THROW_ERRNO_MSG1(ca_mgm::SystemException, str::form(__("Cannot open file %s."), file.c_str()).c_str(), errno); @@ -476,7 +476,7 @@ fileObject.close(); LOGIT_ERROR("Cannot read from file: " << file << "(" << errno << ")"); - BLOCXX_THROW_ERRNO_MSG1(ca_mgm::SystemException, + CA_MGM_THROW_ERRNO_MSG1(ca_mgm::SystemException, str::form(__("Cannot read from file %s."), file.c_str()).c_str(), errno); } @@ -501,7 +501,7 @@ if(pi.exists() && !overwrite) { LOGIT_ERROR ("File already exists: " << file ); - BLOCXX_THROW_ERR(ca_mgm::SystemException, + CA_MGM_THROW_ERR(ca_mgm::SystemException, str::form(__("File already exists: %s."), file.c_str()).c_str(), E_FILE_EXISTS); @@ -511,7 +511,7 @@ if(fd == -1) { LOGIT_ERROR("Cannot open file: " << file << "(" << errno << ")"); - BLOCXX_THROW_ERRNO_MSG1(ca_mgm::SystemException, + CA_MGM_THROW_ERRNO_MSG1(ca_mgm::SystemException, str::form(__("Cannot open file %s."), file.c_str()).c_str(), errno); @@ -523,7 +523,7 @@ if(r != 0) { LOGIT_ERROR("Cannot get lock on file: " << file << "(" << errno << ")"); - BLOCXX_THROW_ERRNO_MSG1(ca_mgm::SystemException, + CA_MGM_THROW_ERRNO_MSG1(ca_mgm::SystemException, str::form(__("Cannot get lock on file %s."), file.c_str()).c_str(), errno); @@ -537,7 +537,7 @@ fileObject.close(); LOGIT_ERROR("Cannot write to file: " << file << "(" << errno << ")"); - BLOCXX_THROW_ERRNO_MSG1(ca_mgm::SystemException, + CA_MGM_THROW_ERRNO_MSG1(ca_mgm::SystemException, str::form(__("Cannot write to file %s."), file.c_str()).c_str(), errno); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp Sat Jul 10 18:47:47 2010 @@ -312,19 +312,19 @@ if( maxLogFileSize >= (UInt64(-1) / UInt64(1024))) { - BLOCXX_THROW(ca_mgm::OverflowException, + CA_MGM_THROW(ca_mgm::OverflowException, __("The specified maximum log file size is too big.") ); } if( filename.empty()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("The log file path should be set.") ); } if( !filename.startsWith(BLOCXX_FILENAME_SEPARATOR)) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("The specified log file name '%s' " "is not absolute"), filename.c_str()).c_str() 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp Sat Jul 10 18:47:47 2010 @@ -50,7 +50,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("File does not exist: " << configFile); - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, str::form(__("File does not exist: %s."), configFile.c_str()).c_str(), E_FILE_NOT_FOUND); } @@ -59,7 +59,7 @@ if(!pi.exists() || !pi.isDir()) { LOGIT_ERROR("Directory does not exist: " << tmpDir); - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, str::form(__("Directory does not exist: %s."), tmpDir.c_str()).c_str(), E_FILE_NOT_FOUND); } @@ -68,7 +68,7 @@ if(!pi.exists() || !pi.isFile() || !pi.isX()) { LOGIT_ERROR("Invalid command: " << command); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid command %s."), command.c_str()).c_str()); } @@ -123,10 +123,10 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -138,7 +138,7 @@ std::vectorstd::string sa; str::split(errOutput, std::back_inserter(sa), "\n\r"); std::string msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } @@ -171,7 +171,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid key file specified.")); } @@ -232,10 +232,10 @@ errOutput, env, -1, -1, stdInput); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -248,7 +248,7 @@ str::split(errOutput, std::back_inserter(sa), "\n\r"); std::string msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } @@ -275,7 +275,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid key file specified.")); } @@ -283,7 +283,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid request file specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid request file specified.")); } @@ -332,10 +332,10 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -348,7 +348,7 @@ str::split(errOutput, std::back_inserter(sa), "\n\r"); std::string msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } @@ -380,7 +380,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid key file specified.")); } @@ -388,7 +388,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid request file specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid request file specified.")); } @@ -458,10 +458,10 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -474,7 +474,7 @@ str::split(errOutput, std::back_inserter(sa), "\n\r"); std::string msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } @@ -500,7 +500,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid key file specified.")); } @@ -508,7 +508,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid CA certificate file specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid CA certificate file specified.")); } @@ -516,7 +516,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid certificate file specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid certificate file specified.")); } @@ -598,10 +598,10 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -614,7 +614,7 @@ str::split(errOutput, std::back_inserter(sa), "\n\r"); std::string msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } @@ -641,7 +641,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid key file specified.")); } @@ -649,7 +649,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid CA certificate file specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid CA certificate file specified.")); } @@ -700,10 +700,10 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -716,7 +716,7 @@ str::split(errOutput, std::back_inserter(sa), "\n\r"); std::string msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } @@ -739,7 +739,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid keyfile specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid key file specified.")); } @@ -747,7 +747,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid CA certificate file specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid CA certificate file specified.")); } @@ -784,10 +784,10 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } @@ -803,7 +803,7 @@ str::split(errOutput, std::back_inserter(sa), "\n\r"); std::string msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } @@ -827,7 +827,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("No valid certificate file specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid certificate file specified.")); } @@ -835,7 +835,7 @@ if(!pi.exists() || !pi.isDir()) { LOGIT_ERROR("No valid CA directory specified"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("No valid CA directory specified.")); } @@ -875,10 +875,10 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } @@ -956,10 +956,10 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } @@ -989,7 +989,7 @@ { LOGIT_ERROR("openssl stderr:" << errOutput); } - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("Showing certificate status with serial %s failed (%d)."), serial.c_str(), status).c_str()); } @@ -1014,7 +1014,7 @@ if(sa.size() != 2) { LOGIT_ERROR("Can not parse certificate name"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Cannot parse the certificate name.")); } @@ -1025,7 +1025,7 @@ if(!pi.exists() || !pi.isFile()) { LOGIT_ERROR("Keyfile does not exist"); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, __("The key file does not exist.")); } @@ -1055,10 +1055,10 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status == 0) @@ -1140,13 +1140,13 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); path::removeFile(inFileName); path::removeFile(outFileName); path::removeFile(randfile); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -1174,7 +1174,7 @@ str::split(errOutput, std::back_inserter(sa), "\n\r"); std::string msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } @@ -1280,13 +1280,13 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); path::removeFile(inFileName); path::removeFile(outFileName); path::removeFile(randfile); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -1324,12 +1324,12 @@ std::string msg = (sa.empty()? "" : sa[0]); if(PerlRegEx("unable to load Private Key", PCRE_CASELESS).match(msg)) { - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, __("Invalid password."), E_INVALID_PASSWD); } else { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"),msg.c_str()).c_str()); } } @@ -1405,13 +1405,13 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); path::removeFile(inFileName); path::removeFile(outFileName); path::removeFile(randfile); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -1439,7 +1439,7 @@ str::split(errOutput, std::back_inserter(sa), "\n\r"); std::string msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } @@ -1514,13 +1514,13 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); path::removeFile(inFileName); path::removeFile(outFileName); path::removeFile(randfile); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -1548,7 +1548,7 @@ str::split(errOutput, std::back_inserter(sa), "\n\r"); std::string msg = (sa.empty()? "" : sa[0]); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } @@ -1626,7 +1626,7 @@ else { LOGIT_ERROR("Out password is required"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("The password for encrypting the output is required.")); } @@ -1667,7 +1667,7 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); path::removeFile(inFileName1); @@ -1678,7 +1678,7 @@ } path::removeFile(outFileName); path::removeFile(randfile); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -1713,12 +1713,12 @@ std::string msg = (sa.empty()? "" : sa[0]); if(PerlRegEx("unable to load Private Key", PCRE_CASELESS).match(msg)) { - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, __("Invalid password."), E_INVALID_PASSWD); } else { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } } @@ -1773,7 +1773,7 @@ else { LOGIT_ERROR("PKCS12 password is required"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("The PKCS12 password is required.")); } @@ -1816,13 +1816,13 @@ status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput, errOutput, env); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); path::removeFile(inFileName); path::removeFile(outFileName); path::removeFile(randfile); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -1860,12 +1860,12 @@ std::string msg = (sa.empty()? "" : sa[0]); if(PerlRegEx("invalid password", PCRE_CASELESS).match(msg)) { - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, __("Invalid password."), E_INVALID_PASSWD); } else { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), msg.c_str()).c_str()); } } @@ -1891,7 +1891,7 @@ { LOGIT_ERROR("Cannot read directory: " << repository << "(" << System::errorMsg(r) << ") [" << r << "]"); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot read directory: %s (%s) [%d]."), repository.c_str(), ::strerror(r), r).c_str()); } @@ -1941,7 +1941,7 @@ else { LOGIT_ERROR("No serial number found in " << serialFile); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("No serial number found in %s."), serialFile.c_str()).c_str()); } @@ -1961,7 +1961,7 @@ if( (*it)[0] == md5 ) { LOGIT_ERROR("Request already exist."); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("The request already exists.")); } } @@ -2091,7 +2091,7 @@ { LOGIT_ERROR("Cannot read directory: " << reqDir << "(" << System::errorMsg(r) << ") [" << r << "]"); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot read directory: %s (%s) [%d]."), reqDir.c_str(), ::strerror(r), r).c_str()); } @@ -2152,7 +2152,7 @@ if(subject.empty()) { LOGIT_ERROR("Can not find request subject."); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Cannot find the request subject.")); } @@ -2243,7 +2243,7 @@ { LOGIT_ERROR("Cannot read directory: " << certDir << "(" << System::errorMsg(r) << ") [" << r << "]"); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot read directory: %s (%s) [%d]."), certDir.c_str(), ::strerror(r), r).c_str()); } @@ -2313,7 +2313,7 @@ if(subject.empty()) { LOGIT_ERROR("Can not find certificate subject."); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Cannot find the certificate subject.")); } @@ -2412,7 +2412,7 @@ if(caName.empty() || !PerlRegEx("\\w+").match(caName)) { LOGIT_ERROR("Invalid caName: " << caName); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid caName: %s."), caName.c_str()).c_str()); } @@ -2421,7 +2421,7 @@ if(!pi.exists() || !pi.isDir()) { LOGIT_ERROR(repository << " does not exist"); - BLOCXX_THROW_ERR(ca_mgm::SystemException, + CA_MGM_THROW_ERR(ca_mgm::SystemException, str::form(__("'%s' does not exist."), repository.c_str()).c_str(), E_FILE_NOT_FOUND); } @@ -2431,7 +2431,7 @@ if(pi.exists()) { LOGIT_ERROR(pi.toString() << " still exist"); - BLOCXX_THROW_ERR(ca_mgm::SystemException, + CA_MGM_THROW_ERR(ca_mgm::SystemException, str::form(__("%s still exists."), pi.toString().c_str()).c_str(), E_FILE_EXISTS); } @@ -2442,9 +2442,9 @@ { LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])", pi.toString().c_str(), ::strerror(r), r)); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot create directory: %s (%s [%d])."), - pi.toString().c_str(), ::strerror(r), r).c_str()); + pi.toString().c_str(), ::strerror(r), r).c_str()); } ByteBuffer tmpl; @@ -2473,11 +2473,11 @@ LocalManagement::writeFile(ByteBuffer(newConf.c_str(), newConf.length()), pi.toString() + "/openssl.cnf.tmpl"); } - catch(blocxx::Exception &e) + catch(Exception &e) { path::removeDirRecursive(repository + "/" + caName); - BLOCXX_THROW_SUBEX(ca_mgm::SystemException, + CA_MGM_THROW_SUBEX(ca_mgm::SystemException, __("Cannot copy the configuration template."), e); } @@ -2490,7 +2490,7 @@ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])", dir.c_str(), ::strerror(r), r)); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot create directory: %s (%s [%d])."), dir.c_str(), ::strerror(r), r).c_str()); } @@ -2504,7 +2504,7 @@ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])", dir.c_str(), ::strerror(r), r)); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot create directory: %s (%s [%d])."), dir.c_str(), ::strerror(r), r).c_str()); } @@ -2518,7 +2518,7 @@ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])", dir.c_str(), ::strerror(r), r)); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot create directory: %s (%s [%d])."), dir.c_str(), ::strerror(r), r).c_str()); } @@ -2532,7 +2532,7 @@ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])", dir.c_str(), ::strerror(r), r)); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot create directory: %s (%s [%d])."), dir.c_str(), ::strerror(r), r).c_str()); } @@ -2546,7 +2546,7 @@ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])", dir.c_str(), ::strerror(r), r)); - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Cannot create directory: %s (%s [%d])."), dir.c_str(), ::strerror(r), r).c_str()); } @@ -2560,11 +2560,11 @@ LocalManagement::writeFile(ByteBuffer(), pi.toString() + "/cam.txt"); } - catch(blocxx::Exception &e) + catch(Exception &e) { path::removeDirRecursive(repository + "/" + caName); - BLOCXX_THROW_SUBEX(ca_mgm::SystemException, + CA_MGM_THROW_SUBEX(ca_mgm::SystemException, __("Cannot create the file."), e); } } @@ -2598,11 +2598,11 @@ errOutput, env, -1, -1, in); } - catch(blocxx::Exception& e) + catch(Exception& e) { LOGIT_ERROR( "openssl exception:" << e); path::removeFile(randfile); - BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException, + CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException, __("Executing openssl command failed."), e); } if(status != 0) @@ -2624,7 +2624,7 @@ if(foundError) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("openssl command failed: %s"), errOutput.c_str()).c_str()); } return stdOutput; 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp Sat Jul 10 18:47:47 2010 @@ -188,7 +188,7 @@ if( name.find_first_of('/') != std::string::npos || name.find_first_of('\\') != std::string::npos) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("The specified filename component '%s' " "contains a filename separator"), name.c_str()).c_str() @@ -350,7 +350,7 @@ { if( prefix != 2) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid drive letter prefix in the specified path list.")); } drive = *item; @@ -358,7 +358,7 @@ else if( !item->empty() ) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("The first pathname list component has to be " "empty or contain a drive letter prefix") ); @@ -372,7 +372,7 @@ } catch(const ca_mgm::ValueException &e) { - BLOCXX_THROW_SUBEX(ca_mgm::ValueException, + CA_MGM_THROW_SUBEX(ca_mgm::ValueException, __("The path list contains an element with a filename separator."), e); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp Sat Jul 10 18:47:47 2010 @@ -34,15 +34,12 @@ inline static std::string mode2String(mode_t o) { std::string s; - //s.format("%#4o", o); s = str::form("0%03o", o); return s; } inline static std::string errno2String(int e) { - char buf[blocxx::ExceptionDetail::BUFSZ]; - blocxx::ExceptionDetail::portable_strerror_r(e, buf, sizeof(buf)); - std::string s(buf); + std::string s(::strerror(e)); s += "(" + str::numstring(e) + ")"; return s; } Modified: limal-branches/mc-devel/limal-ca-mgm/src/PerlRegEx.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/PerlRegEx.cpp?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/PerlRegEx.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/PerlRegEx.cpp Sat Jul 10 18:47:47 2010 @@ -205,7 +205,7 @@ { if( !compile(regex, cflags)) { - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, errorString().c_str(), m_ecode); } } @@ -220,7 +220,7 @@ { if( ref.m_pcre != NULL && !compile(ref.m_rxstr, ref.m_flags)) { - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, errorString().c_str(), m_ecode); } } @@ -254,7 +254,7 @@ } else if( !compile(ref.m_rxstr, ref.m_flags)) { - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, errorString().c_str(), m_ecode); } return *this; @@ -340,18 +340,18 @@ { if( m_pcre == NULL) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } if( count >= size_t(INT_MAX / 3)) { - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, "Match count limit exceeded"); } if( index > str.length()) { - BLOCXX_THROW(ca_mgm::OverflowException, + CA_MGM_THROW(ca_mgm::OverflowException, str::form("String index out of bounds (" "length = %d, index = %d).", str.length(), index @@ -410,18 +410,18 @@ { if( m_pcre == NULL) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } if( count >= size_t(INT_MAX / 3)) { - BLOCXX_THROW(ca_mgm::SystemException, + CA_MGM_THROW(ca_mgm::SystemException, "Match count limit exceeded"); } if( index > str.length()) { - BLOCXX_THROW(ca_mgm::OverflowException, + CA_MGM_THROW(ca_mgm::OverflowException, str::form("String index out of bounds (" "length = %d, index = %d)", str.length(), index @@ -478,7 +478,7 @@ { if( m_pcre == NULL) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } @@ -490,7 +490,7 @@ { if( rsub.empty()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Non-capturing regular expression"); } @@ -510,7 +510,7 @@ } else if(m_ecode != PCRE_ERROR_NOMATCH) { - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, errorString().c_str(), m_ecode); } return ssub; @@ -524,7 +524,7 @@ { if( m_pcre == NULL) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } @@ -543,7 +543,7 @@ rsub[0].rm_eo < 0) { // only if empty (missused as guard). - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Non-capturing regular expression"); } @@ -561,7 +561,7 @@ } else { - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, errorString().c_str(), m_ecode); } } while(global && match && out.length() > off); @@ -576,7 +576,7 @@ { if( m_pcre == NULL) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } @@ -595,7 +595,7 @@ rsub[0].rm_so < 0 || rsub[0].rm_eo < 0) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Non-capturing regular expression"); } @@ -618,7 +618,7 @@ } else { - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, errorString().c_str(), m_ecode); } } while(match && len > off); @@ -633,7 +633,7 @@ { if( m_pcre == NULL) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } @@ -656,7 +656,7 @@ { m_ecode = ret; m_error = getError(m_ecode); - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, errorString().c_str(), m_ecode); } } @@ -671,13 +671,13 @@ { if( m_pcre == NULL) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } if( index > str.length()) { - BLOCXX_THROW(ca_mgm::OverflowException, + CA_MGM_THROW(ca_mgm::OverflowException, str::form("String index out of bounds." "length = %d, index = %d", str.length(), index @@ -699,7 +699,7 @@ else { m_error = getError(m_ecode); - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, errorString().c_str(), m_ecode); } } Modified: limal-branches/mc-devel/limal-ca-mgm/src/PosixRegEx.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/PosixRegEx.cpp?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/PosixRegEx.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/PosixRegEx.cpp Sat Jul 10 18:47:47 2010 @@ -130,7 +130,7 @@ { if( !compile(regex, cflags)) { - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, errorString().c_str(), m_ecode); } } @@ -145,7 +145,7 @@ { if( ref.compiled && !compile(ref.m_rxstr, ref.m_flags)) { - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, errorString().c_str(), m_ecode); } } @@ -179,7 +179,7 @@ } else if( !compile(ref.m_rxstr, ref.m_flags)) { - BLOCXX_THROW_ERR(ca_mgm::ValueException, + CA_MGM_THROW_ERR(ca_mgm::ValueException, errorString().c_str(), m_ecode); } return *this; @@ -260,13 +260,13 @@ { if( !compiled) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } if( index > str.length()) { - BLOCXX_THROW(ca_mgm::OverflowException, + CA_MGM_THROW(ca_mgm::OverflowException, str::form("String index out of bounds (" "length = %d, index = %d).", str.length(), index @@ -322,7 +322,7 @@ { if( !compiled) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } @@ -334,7 +334,7 @@ { if( rsub.empty()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Non-capturing regular expression"); } @@ -354,7 +354,7 @@ } else if(m_ecode != REG_NOMATCH) { - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, errorString().c_str(), m_ecode); } return ssub; @@ -368,7 +368,7 @@ { if( !compiled) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } @@ -387,7 +387,7 @@ rsub[0].rm_eo < 0) { // only if empty (missused as guard). - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Non-capturing regular expression"); } @@ -405,7 +405,7 @@ } else { - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, errorString().c_str(), m_ecode); } } while(global && match && out.length() > off); @@ -419,7 +419,7 @@ { if( !compiled) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } @@ -438,7 +438,7 @@ rsub[0].rm_so < 0 || rsub[0].rm_eo < 0) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Non-capturing regular expression"); } @@ -461,7 +461,7 @@ } else { - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, errorString().c_str(), m_ecode); } } while(match && len > off); @@ -476,7 +476,7 @@ { if( !compiled) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } @@ -499,7 +499,7 @@ { m_ecode = ret; m_error = getError(&m_regex, m_ecode); - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, errorString().c_str(), m_ecode); } } @@ -515,13 +515,13 @@ { if( !compiled) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, "Regular expression is not compiled"); } if( index > str.length()) { - BLOCXX_THROW(ca_mgm::OverflowException, + CA_MGM_THROW(ca_mgm::OverflowException, str::form("String index out of bounds (" "length = %d, index = %d).", str.length(), index @@ -544,7 +544,7 @@ else { m_error = getError(&m_regex, m_ecode); - BLOCXX_THROW_ERR(ca_mgm::RuntimeException, + CA_MGM_THROW_ERR(ca_mgm::RuntimeException, errorString().c_str(), m_ecode); } } 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=2685&r1=2684&r2=2685&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 Jul 10 18:47:47 2010 @@ -94,7 +94,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->subject = dn; } @@ -130,7 +130,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->extensions = ext; } @@ -175,7 +175,7 @@ if(pkey == NULL) { LOGIT_ERROR("Unable to get public key"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Unable to get the public key.")); } @@ -186,7 +186,7 @@ if(!rsa) { LOGIT_ERROR("could not get RSA key"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Could not get RSA key.")); } @@ -206,7 +206,7 @@ EVP_PKEY_free(pkey); LOGIT_ERROR("Unsupported public key type"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Unsupported public key type.")); } @@ -239,7 +239,7 @@ EVP_PKEY_free(pkey); LOGIT_ERROR("Unsupported public key algorithm"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Unsupported public key algorithm.")); } @@ -269,7 +269,7 @@ EVP_PKEY_free(pkey); LOGIT_ERROR("Unsupported signature algorithm: '" << sbuf << "'"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, str::form(__("Unsupported signature algorithm %s."), sbuf.c_str()).c_str()); } @@ -362,7 +362,7 @@ if(!bio) { LOGIT_ERROR("Can not create a memory BIO"); - BLOCXX_THROW(ca_mgm::MemoryException, + CA_MGM_THROW(ca_mgm::MemoryException, __("Cannot create a memory BIO.")); } @@ -389,7 +389,7 @@ if(m_impl->x509 == NULL) { LOGIT_ERROR("Can not parse request"); - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("Cannot parse the request.")); } @@ -402,7 +402,7 @@ X509_REQ_free(m_impl->x509); m_impl->x509 = NULL; - BLOCXX_THROW_SUBEX(ca_mgm::SyntaxException, + CA_MGM_THROW_SUBEX(ca_mgm::SyntaxException, __("Error while parsing the request."), e); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp Sat Jul 10 18:47:47 2010 @@ -136,7 +136,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->subject = dn; } @@ -208,7 +208,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->extensions = ext; } @@ -233,7 +233,7 @@ if(!m_impl->extensions.valid()) { LOGIT_ERROR("invalid RequestGenerationData object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid RequestGenerationData object.")); } @@ -241,7 +241,7 @@ type == E_Server_Cert || type == E_CA_Cert ) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp Sat Jul 10 18:47:47 2010 @@ -102,7 +102,7 @@ if(!initURICheck().isValid(v)) { LOGIT_ERROR("invalid value for NsBaseUrlExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsBaseUrlExt.")); } setPresent(true); @@ -115,7 +115,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -160,7 +160,7 @@ if(!initURICheck().isValid(v)) { LOGIT_ERROR("invalid value for NsBaseUrlExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsBaseUrlExt.")); } m_impl->value = v; @@ -172,7 +172,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("NsBaseUrlExt is not present.")); } return m_impl->value; @@ -184,7 +184,7 @@ if(!valid()) { LOGIT_ERROR("invalid NsBaseUrlExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid NsBaseUrlExt object.")); } @@ -192,7 +192,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -267,7 +267,7 @@ { if(!initURICheck().isValid(v)) { LOGIT_ERROR("invalid value for NsRevocationUrlExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsRevocationUrlExt.")); } setPresent(true); @@ -280,7 +280,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -320,7 +320,7 @@ { if(!initURICheck().isValid(v)) { LOGIT_ERROR("invalid value for NsRevocationUrlExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsRevocationUrlExt.")); } m_impl->value = v; @@ -331,7 +331,7 @@ NsRevocationUrlExt::getValue() const { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("NsRevocationUrlExt is not present.")); } return m_impl->value; @@ -342,7 +342,7 @@ { if(!valid()) { LOGIT_ERROR("invalid NsRevocationUrlExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid NsRevocationUrlExt object.")); } @@ -350,7 +350,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -421,7 +421,7 @@ { if(!initURICheck().isValid(v)) { LOGIT_ERROR("invalid value for NsCaRevocationUrlExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsCaRevocationUrlExt.")); } setPresent(true); @@ -434,7 +434,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -474,7 +474,7 @@ { if(!initURICheck().isValid(v)) { LOGIT_ERROR("invalid value for NsCaRevocationUrlExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsCaRevocationUrlExt.")); } m_impl->value = v; @@ -485,7 +485,7 @@ NsCaRevocationUrlExt::getValue() const { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("NsCaRevocationUrlExt is not present.")); } return m_impl->value; @@ -496,7 +496,7 @@ { if(!valid()) { LOGIT_ERROR("invalid NsCaRevocationUrlExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid NsCaRevocationUrlExt object.")); } @@ -504,7 +504,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -574,7 +574,7 @@ { if(!initURICheck().isValid(v)) { LOGIT_ERROR("invalid value for NsRenewalUrlExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsRenewalUrlExt.")); } setPresent(true); @@ -587,7 +587,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -627,7 +627,7 @@ { if(!initURICheck().isValid(v)) { LOGIT_ERROR("invalid value for NsRenewalUrlExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsRenewalUrlExt.")); } m_impl->value = v; @@ -638,7 +638,7 @@ NsRenewalUrlExt::getValue() const { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("NsRenewalUrlExt is not present.")); } return m_impl->value; @@ -649,7 +649,7 @@ { if(!valid()) { LOGIT_ERROR("invalid NsRenewalUrlExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid NsRenewalUrlExt object.")); } @@ -657,7 +657,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -726,7 +726,7 @@ { if(!initURICheck().isValid(v)) { LOGIT_ERROR("invalid value for NsCaPolicyUrlExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsCaPolicyUrlExt.")); } setPresent(true); @@ -739,7 +739,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -779,7 +779,7 @@ { if(!initURICheck().isValid(v)) { LOGIT_ERROR("invalid value for NsCaPolicyUrlExt"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for NsCaPolicyUrlExt.")); } m_impl->value = v; @@ -790,7 +790,7 @@ NsCaPolicyUrlExt::getValue() const { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("NsCaPolicyUrlExt is not present.")); } return m_impl->value; @@ -801,7 +801,7 @@ { if(!valid()) { LOGIT_ERROR("invalid NsCaPolicyUrlExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid NsCaPolicyUrlExt object.")); } @@ -809,7 +809,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -887,7 +887,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Invalid type: %1."), type).c_str()); } @@ -933,7 +933,7 @@ NsSslServerNameExt::getValue() const { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("NsSslServerNameExt is not present.")); } return m_impl->value; @@ -944,14 +944,14 @@ { if(!valid()) { LOGIT_ERROR("invalid NsSslServerNameExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid NsSslServerNameExt object.")); } // This extension is not supported by type CRL if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -1013,7 +1013,7 @@ // These types are not supported by this object if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -1059,7 +1059,7 @@ NsCommentExt::getValue() const { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("NsCommentExt is not present.")); } return m_impl->value; @@ -1070,14 +1070,14 @@ { if(!valid()) { LOGIT_ERROR("invalid NsCommentExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid NsCommentExt object.")); } // This extension is not supported by type CRL if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp Sat Jul 10 18:47:47 2010 @@ -78,7 +78,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -124,7 +124,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } setPresent(true); } @@ -165,7 +165,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->altNameList = alternativeNameList; setPresent(true); @@ -176,7 +176,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("SubjectAlternativeNameExt is not present.")); } return m_impl->emailCopy; @@ -187,7 +187,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("SubjectAlternativeNameExt is not present.")); } return m_impl->altNameList; @@ -200,7 +200,7 @@ if(!valid()) { LOGIT_ERROR("invalid SubjectAlternativeNameExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid SubjectAlternativeNameExt object.")); } @@ -208,7 +208,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp Sat Jul 10 18:47:47 2010 @@ -78,7 +78,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } @@ -122,7 +122,7 @@ !initHexCheck().isValid(keyid)) { LOGIT_ERROR("invalid KeyID"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid KeyID.")); } setPresent(true); @@ -156,7 +156,7 @@ if(!keyId.empty() && !initHexCheck().isValid(keyId)) { LOGIT_ERROR("invalid KeyID"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid KeyID.")); } m_impl->autodetect = autoDetect; @@ -169,7 +169,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("SubjectKeyIdentifierExt is not present.")); } return m_impl->autodetect; @@ -180,7 +180,7 @@ { if(!isPresent()) { - BLOCXX_THROW(ca_mgm::RuntimeException, + CA_MGM_THROW(ca_mgm::RuntimeException, __("SubjectKeyIdentifierExt is not present.")); } return m_impl->keyid; @@ -193,7 +193,7 @@ if(!valid()) { LOGIT_ERROR("invalid SubjectKeyIdentifierExt object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid SubjectKeyIdentifierExt object.")); } @@ -201,7 +201,7 @@ if(type == E_CRL) { LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp Sat Jul 10 18:47:47 2010 @@ -60,7 +60,7 @@ { if( !m_impl) { - BLOCXX_THROW(url::UrlException, + CA_MGM_THROW(url::UrlException, __("The URL implementation reference cannot be empty.") ); } @@ -81,7 +81,7 @@ UrlRef url( parseUrl(urlString)); if( !url) { - BLOCXX_THROW(url::UrlException, + CA_MGM_THROW(url::UrlException, __("The URL implementation reference cannot be empty.") ); } @@ -119,14 +119,14 @@ } catch(const blocxx::Exception &e) { - BLOCXX_THROW_SUBEX(url::UrlParsingException, + CA_MGM_THROW_SUBEX(url::UrlParsingException, str::form(__("Unable to parse url string '%s'."), urlString.c_str()).c_str(), e ); } catch( ... ) { - BLOCXX_THROW(url::UrlParsingException, + CA_MGM_THROW(url::UrlParsingException, str::form(__("Unable to parse url string '%s'."), urlString.c_str()).c_str() ); 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp Sat Jul 10 18:47:47 2010 @@ -152,7 +152,7 @@ { if( regx.empty() || regx == "^$") { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, str::form(__("The %s url component is " "not allowed in this scheme"), name.c_str()).c_str() @@ -171,14 +171,14 @@ { if( show) { - BLOCXX_THROW(UrlBadComponentException, + CA_MGM_THROW(UrlBadComponentException, str::form(__("Invalid %s URL component data '%s'."), name.c_str(), data.c_str()).c_str() ); } else { - BLOCXX_THROW(UrlBadComponentException, + CA_MGM_THROW(UrlBadComponentException, str::form(__("Invalid data in the %s URL component."), name.c_str()).c_str() ); } @@ -263,21 +263,21 @@ { if( components.has_authority && config("with_authority") != "y") { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("The authority url component is not " "allowed in this scheme") ); } if( components.has_querystr && config("rx_querystr").empty()) { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("The query string url component is not " "allowed in this scheme") ); } if( components.has_fragment && config("rx_fragment").empty()) { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("The fragment string url component is not " "allowed in this scheme") ); @@ -773,7 +773,7 @@ if( config("psep_pathparam").empty() || config("vsep_pathparam").empty()) { - BLOCXX_THROW(UrlNotSupportedException, + CA_MGM_THROW(UrlNotSupportedException, __("Path parameter parsing is not supported for this URL.") ); } @@ -822,7 +822,7 @@ if( config("psep_querystr").empty() || config("vsep_querystr").empty()) { - BLOCXX_THROW(UrlNotSupportedException, + CA_MGM_THROW(UrlNotSupportedException, __("Query string parsing is not supported for this URL.") ); } @@ -857,13 +857,13 @@ else if( scheme.empty()) { - BLOCXX_THROW(UrlBadComponentException, + CA_MGM_THROW(UrlBadComponentException, __("The URL scheme is a required component.") ); } else { - BLOCXX_THROW(UrlBadComponentException, + CA_MGM_THROW(UrlBadComponentException, str::form(__("Invalid URL scheme '%s'."), scheme.c_str()).c_str() ); @@ -963,7 +963,7 @@ { if( config("with_authority") != "y") { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("The username component is not " "allowed in this scheme") ); @@ -997,7 +997,7 @@ { if( config("with_authority") != "y") { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("The password component is not " "allowed in this scheme") ); @@ -1027,7 +1027,7 @@ { if(config("require_host") == "m") { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("The URL scheme requires a host.") ); } @@ -1037,7 +1037,7 @@ { if( config("with_authority") != "y") { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("The hostname component is not " "allowed in this scheme") ); @@ -1101,7 +1101,7 @@ if( config("with_authority") != "y" || config("with_port") != "y") { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("The port number component is not " "allowed in this scheme") ); @@ -1122,7 +1122,7 @@ { if(config("require_pathname") == "m") { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("The URL scheme requires a path.") ); } @@ -1185,7 +1185,7 @@ if( config("psep_pathparam").empty() || config("vsep_pathparam").empty()) { - BLOCXX_THROW(UrlNotSupportedException, + CA_MGM_THROW(UrlNotSupportedException, __("Path parameter parsing is not supported for this URL.") ); } @@ -1230,7 +1230,7 @@ if( config("psep_querystr").empty() || config("vsep_querystr").empty()) { - BLOCXX_THROW(UrlNotSupportedException, + CA_MGM_THROW(UrlNotSupportedException, __("Query string parsing is not supported for this URL.") ); } @@ -1361,7 +1361,7 @@ // We don't support the IP-Literal "[v<HEX> ... ]" format if( host.at(1) == 'v') { - BLOCXX_THROW(UrlBadComponentException, + CA_MGM_THROW(UrlBadComponentException, __("The IPvFuture URL host format is not supported.") ); } @@ -1395,7 +1395,7 @@ if( !valid) { - BLOCXX_THROW(UrlBadComponentException, + CA_MGM_THROW(UrlBadComponentException, str::form(__("Invalid hostname URL component data '%s'."), host.c_str()).c_str() ); @@ -1425,7 +1425,7 @@ if( !valid) { - BLOCXX_THROW(UrlBadComponentException, + CA_MGM_THROW(UrlBadComponentException, str::form(__("Invalid port number URL component data '%s'."), port.c_str()).c_str() ); @@ -1451,7 +1451,7 @@ if(!(path.at(0) == '/' || (path.length() >= 3 && str::toLower(path.substr(0, 3)) == "%2f"))) { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("A relative path is not allowed if authority exists.") ); } @@ -1464,7 +1464,7 @@ { if(path.at(0) != '/') { - BLOCXX_THROW(UrlNotAllowedException, + CA_MGM_THROW(UrlNotAllowedException, __("A relative path is not allowed if authority exists.") ); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp Sat Jul 10 18:47:47 2010 @@ -195,7 +195,7 @@ // is a %00 octet allowed ? if( !allowNUL) { - BLOCXX_THROW(UrlDecodingException, + CA_MGM_THROW(UrlDecodingException, __("The URL-encoded string may not contain a NULL byte.") ); } @@ -256,7 +256,7 @@ { if( psep.empty()) { - BLOCXX_THROW(UrlNotSupportedException, + CA_MGM_THROW(UrlNotSupportedException, __("Invalid split separator character.") ); } @@ -294,7 +294,7 @@ { if( psep.empty() || vsep.empty()) { - BLOCXX_THROW(UrlNotSupportedException, + CA_MGM_THROW(UrlNotSupportedException, __("Invalid split separator character.") ); } @@ -368,7 +368,7 @@ { if( psep.empty() || vsep.empty()) { - BLOCXX_THROW(UrlNotSupportedException, + CA_MGM_THROW(UrlNotSupportedException, __("Invalid parameter map join separator character.") ); } @@ -444,7 +444,7 @@ } else { - BLOCXX_THROW(UrlParsingException, + CA_MGM_THROW(UrlParsingException, __("Unable to parse main URL components.") ); } @@ -489,7 +489,7 @@ } else { - BLOCXX_THROW(UrlParsingException, + CA_MGM_THROW(UrlParsingException, __("Unable to parse URL authority components.") ); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp Sat Jul 10 18:47:47 2010 @@ -239,7 +239,7 @@ break; default: LOGIT_ERROR("wrong type" << type); - BLOCXX_THROW(ValueException, str::form("wrong type: %d", type).c_str()); + CA_MGM_THROW(ValueException, str::form("wrong type: %d", type).c_str()); } LOGIT_DEBUG("type2Section: type=" << type << " result=" << result); return result; 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp Sat Jul 10 18:47:47 2010 @@ -124,7 +124,7 @@ { if( !m_self) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("The value check may not contain a NULL pointer.")); } @@ -155,7 +155,7 @@ { if( !m_self) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("The value check may not contain a NULL pointer.")); } @@ -236,7 +236,7 @@ } else { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("The value check may not contain a NULL pointer.")); } } 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=2685&r1=2684&r2=2685&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 Jul 10 18:47:47 2010 @@ -75,7 +75,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->authorityKeyIdentifier = ext; } @@ -87,7 +87,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str()); + CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str()); } m_impl->issuerAlternativeName = ext; } @@ -129,12 +129,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp Sat Jul 10 18:47:47 2010 @@ -95,7 +95,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CRLGenerationExts::setAuthorityKeyIdentifier.")); } m_impl->authorityKeyIdentifier = ext; @@ -118,7 +118,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CRLGenerationExts::setIssuerAlternativeName.")); } m_impl->issuerAlternativeName = ext; @@ -142,7 +142,7 @@ if(!valid()) { LOGIT_ERROR("invalid X509v3RequestExts object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid X509v3RequestExts object.")); } 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=2685&r1=2684&r2=2685&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 Jul 10 18:47:47 2010 @@ -145,7 +145,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->nsBaseUrl = ext; } @@ -157,7 +157,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->nsRevocationUrl = ext; } @@ -169,7 +169,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->nsCaRevocationUrl = ext; } @@ -181,7 +181,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->nsRenewalUrl = ext; } @@ -193,7 +193,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->nsCaPolicyUrl = ext; } @@ -205,7 +205,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->nsSslServerName = ext; } @@ -217,7 +217,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->nsComment = ext; } @@ -229,7 +229,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->nsCertType = ext; } @@ -241,7 +241,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->keyUsage = ext; } @@ -253,7 +253,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->basicConstraints = ext; } @@ -265,7 +265,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->extendedKeyUsage = ext; } @@ -277,7 +277,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->subjectKeyIdentifier = ext; } @@ -289,7 +289,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->authorityKeyIdentifier = ext; } @@ -301,7 +301,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->subjectAlternativeName = ext; } @@ -313,7 +313,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->issuerAlternativeName = ext; } @@ -325,7 +325,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->authorityInfoAccess = ext; } @@ -337,7 +337,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->crlDistributionPoints = ext; } @@ -349,7 +349,7 @@ if(!r.empty()) { LOGIT_ERROR(r[0]); - BLOCXX_THROW(ValueException, r[0].c_str()); + CA_MGM_THROW(ValueException, r[0].c_str()); } m_impl->certificatePolicies = ext; } @@ -389,14 +389,14 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once: " << nid); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Extension occurred more than once: %1."), nid).c_str()); } LOGIT_ERROR("Unable to parse the certificate (NID:" << nid << " Crit:" << crit << ")"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Unable to parse the certificate (NID: %1 Crit: %2)."), nid, crit).c_str()); } @@ -446,14 +446,14 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once: " << nid); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Extension occurred more than once: %1."), nid).c_str()); } LOGIT_ERROR("Unable to parse the certificate (NID:" << nid << " Crit:" << crit << ")"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Unable to parse the certificate (NID: %1 Crit: %2)."), nid, crit).c_str()); } @@ -505,12 +505,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } @@ -571,12 +571,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } @@ -635,12 +635,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } @@ -694,13 +694,13 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } @@ -764,12 +764,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } @@ -833,13 +833,13 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } @@ -909,12 +909,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } @@ -934,7 +934,7 @@ if(!lv.valid()) { LOGIT_ERROR("Invalid location in authorityInfoAccess"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, __("Invalid location in authorityInfoAccess.")); } @@ -995,12 +995,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(SyntaxException, + CA_MGM_THROW(SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp Sat Jul 10 18:47:47 2010 @@ -167,7 +167,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsBaseUrl.")); } m_impl->nsBaseUrl = ext; @@ -190,7 +190,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsRevocationUrl.")); } m_impl->nsRevocationUrl = ext; @@ -213,7 +213,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsCaRevocationUrl.")); } m_impl->nsCaRevocationUrl = ext; @@ -236,7 +236,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsRenewalUrl.")); } m_impl->nsRenewalUrl = ext; @@ -259,7 +259,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsCaPolicyUrl.")); } m_impl->nsCaPolicyUrl = ext; @@ -282,7 +282,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsSslServerName.")); } m_impl->nsSslServerName = ext; @@ -305,7 +305,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsComment.")); } m_impl->nsComment = ext; @@ -328,7 +328,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setNsCertType.")); } m_impl->nsCertType = ext; @@ -351,7 +351,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setKeyUsage.")); } m_impl->keyUsage = ext; @@ -374,7 +374,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setBasicConstraints.")); } m_impl->basicConstraints = ext; @@ -397,7 +397,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setExtendedKeyUsage.")); } m_impl->extendedKeyUsage = ext; @@ -420,7 +420,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setSubjectKeyIdentifier.")); } m_impl->subjectKeyIdentifier = ext; @@ -443,7 +443,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setAuthorityKeyIdentifier.")); } m_impl->authorityKeyIdentifier = ext; @@ -466,7 +466,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setSubjectAlternativeName.")); } m_impl->subjectAlternativeName = ext; @@ -489,7 +489,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setIssuerAlternativeName.")); } m_impl->issuerAlternativeName = ext; @@ -512,7 +512,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setAuthorityInfoAccess.")); } m_impl->authorityInfoAccess = ext; @@ -535,7 +535,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setCRLDistributionPoints.")); } m_impl->crlDistributionPoints = ext; @@ -558,7 +558,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3CertificateIssueExts::setCertificatePolicies.")); } m_impl->certificatePolicies = ext; @@ -582,7 +582,7 @@ if(!valid()) { LOGIT_ERROR("invalid X509v3RequestExts object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid X509v3RequestExts object.")); } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp Sat Jul 10 18:47:47 2010 @@ -64,7 +64,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3RequestExts::setNsSslServerName.")); } m_impl->nsSslServerName = ext; @@ -87,7 +87,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3RequestExts::setNsComment.")); } m_impl->nsComment = ext; @@ -110,7 +110,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3RequestExts::setNsCertType.")); } m_impl->nsCertType = ext; @@ -133,7 +133,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3RequestExts::setKeyUsage.")); } m_impl->keyUsage = ext; @@ -156,7 +156,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3RequestExts::setBasicConstraints.")); } m_impl->basicConstraints = ext; @@ -179,7 +179,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3RequestExts::setExtendedKeyUsage.")); } m_impl->extendedKeyUsage = ext; @@ -202,7 +202,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3RequestExts::setSubjectKeyIdentifier.")); } m_impl->subjectKeyIdentifier = ext; @@ -225,7 +225,7 @@ { if(!ext.valid()) { - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid value for X509v3RequestExts::setSubjectAlternativeName.")); } m_impl->subjectAlternativeName = ext; @@ -249,7 +249,7 @@ if(!valid()) { LOGIT_ERROR("invalid X509v3RequestExts object"); - BLOCXX_THROW(ca_mgm::ValueException, + CA_MGM_THROW(ca_mgm::ValueException, __("Invalid X509v3RequestExts object.")); } m_impl->nsSslServerName.commit2Config(ca, type); 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=2685&r1=2684&r2=2685&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 Jul 10 18:47:47 2010 @@ -128,14 +128,14 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once: " << nid); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Extension occurred more than once: %1."), nid).c_str()); } LOGIT_ERROR("Unable to parse the certificate (NID:" << nid << " Crit:" << crit << ")"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Unable to parse the certificate (NID: %1 Crit: %2)."), nid, crit).c_str()); } @@ -183,14 +183,14 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once: " << nid); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Extension occurred more than once: %1."), nid).c_str()); } LOGIT_ERROR("Unable to parse the certificate (NID:" << nid << " Crit:" << crit << ")"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Unable to parse the certificate (NID: %1 Crit: %2)."), nid, crit).c_str()); } @@ -243,12 +243,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } @@ -309,12 +309,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } @@ -372,13 +372,13 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } @@ -430,12 +430,12 @@ { // extension occurred more than once LOGIT_ERROR("Extension occurred more than once"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, __("Extension occurred more than once.")); } LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")"); - BLOCXX_THROW(ca_mgm::SyntaxException, + CA_MGM_THROW(ca_mgm::SyntaxException, str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str()); } Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp Sat Jul 10 18:47:47 2010 @@ -26,7 +26,7 @@ * BloCxx provides several macros helping to throw exceptions: * @code * #include - * + * * * BLOCXX_THROW_ERRNO_MSG(ca_mgm::SystemException, * "Can't do this and that"); @@ -54,14 +54,189 @@ #ifndef LIMAL_EXCEPTION_HPP #define LIMAL_EXCEPTION_HPP -#include "blocxx/BLOCXX_config.h" -#include "blocxx/Exception.hpp" #include "limal/ca-mgm/config.h" - +#include +#include namespace LIMAL_NAMESPACE { + class Exception : public std::exception + { + friend std::ostream & operator<<( std::ostream & str, const Exception & obj ); + + protected: + Exception(const char* file, int line, const char* msg, + int errorCode, const Exception *otherException = 0); + + public: + Exception(const Exception& e); + Exception& operator= (const Exception& rhs); + virtual ~Exception() throw(); + + /** + * Returns a string representing the concrete type. e.g. "SocketException". Will not return 0. + * This function will not throw. Derived class implementations must not throw. + */ + virtual const char* type() const; + /** + * Returns the message. May return 0. + * This function will not throw. Derived class implementations must not throw. + */ + virtual const char* getMessage() const; + /** + * Returns the full message. + * This function will not throw. Derived class implementations must not throw. + */ + virtual std::string getFullMessage() const; + + /** + * Returns the file. May return 0. + */ + const char* getFile() const; + int getLine() const; + + /** + * Returns the error code representing the error which occurred. + * Code are unique only in the scope of the derived exception class. + * May return UNKNONWN_ERROR_CODE if the error is unavailable. + */ + int getErrorCode() const; + + /** + * Returns getMessage() + */ + virtual const char* what() const throw(); + + private: + char* m_file; + int m_line; + char* m_msg; + int m_errorCode; + }; + +namespace ExceptionDetail +{ + unsigned const BUFSZ = 1024; + + template <typename exType> + struct Errno + { + static exType simple(char const * file, int line, int errnum) + { + return exType(file, line, ::strerror(errnum), errnum); + } + + template <typename Mtype> + static exType format(char const * file, int line, + Mtype const & msg, int errnum) + { + return format(file, line, msg.c_str(), errnum); + } + + static exType format(char const * file, int line, + char const * msg, int errnum) + { + return exType(file, line, str::form("%s: %d(%s)", msg, errnum, ::strerror(errnum)).c_str(), errnum); + } + }; // struct Errno +} + +/** + * Declare a new exception class named \Exception that derives from \. + * This macro is typically used in a header file. + * + * @param NAME The name of the new class (Exception will be postfixed) + * @param BASE The base class. + */ +#define CA_MGM_DECLARE_EXCEPTION(NAME) \ +class NAME##Exception : public ca_mgm::Exception \ +{ \ +public: \ + NAME##Exception(const char* file, int line, const char* msg, int errorCode = 0, const ca_mgm::Exception* otherException = 0); \ + virtual ~NAME##Exception() throw(); \ + virtual const char* type() const; \ +}; + +/** + * Define a new exception class named \Exception that derives from \. + * The new class will use UNKNOWN_SUBCLASS_ID for the subclass id. + * This macro is typically used in a cpp file. + * + * @param NAME The name of the new class (Exception will be postfixed) + * @param BASE The base class. + */ +#define CA_MGM_DEFINE_EXCEPTION(NAME) \ +NAME##Exception::NAME##Exception(const char* file, int line, const char* msg, int errorCode, const ::ca_mgm::Exception* otherException) \ + : ca_mgm::Exception(file, line, msg, errorCode, otherException) {} \ +NAME##Exception::~NAME##Exception() throw() { } \ +const char* NAME##Exception::type() const { return #NAME "Exception"; }\ + + +/** + * Throw an exception using __FILE__ and __LINE__. If applicable, + * BLOCXX_THROW_ERR should be used instead of this macro. + * + * @param exType The type of the exception + * @param msg The exception message. A string that will be copied. + */ +#define CA_MGM_THROW(exType, msg) throw exType(__FILE__, __LINE__, (msg)) + +/** + * Throw an exception using __FILE__ and __LINE__. + * @param exType The type of the exception + * @param msg The exception message. A string that will be copied. + * @param subex A sub-exception. A pointer to it will be passed to the + * exception constructor, which should clone() it. + */ +#define CA_MGM_THROW_SUBEX(exType, msg, subex) \ +throw exType(__FILE__, __LINE__, (msg), 0, &(subex)) + +/** + * Throw an exception using __FILE__ and __LINE__. + * @param exType The type of the exception + * @param msg The exception message. A string that will be copied. + * @param err The error code. + */ +#define CA_MGM_THROW_ERR(exType, msg, err) \ +throw exType(__FILE__, __LINE__, (msg), (err)) +/** + * Throw an exception using __FILE__, __LINE__, errno and strerror(errno) + * @param exType The type of the exception; ctor must take file, line, + * message, and error code. + */ +#define CA_MGM_THROW_ERRNO(exType) CA_MGM_THROW_ERRNO1(exType, errno) + +/** + * Throw an exception using __FILE__, __LINE__, errnum and strerror(errnum) + * @param exType The type of the exception; ctor must take file, line, + * message, and error code. + * @param errnum The errno value. + */ +#define CA_MGM_THROW_ERRNO1(exType, errnum) \ +throw ::ca_mgm::ExceptionDetail::Errno< exType >::simple(__FILE__, __LINE__, (errnum)) + +/** + * Throw an exception using __FILE__, __LINE__, errno and strerror(errno) + * @param exType The type of the exception; ctor must take file, line, + * message, and error code. + * @param msg The exception message to use. + */ +#define CA_MGM_THROW_ERRNO_MSG(exType, msg) \ +CA_MGM_THROW_ERRNO_MSG1(exType, (msg), errno) + +/** + * Throw an exception using __FILE__, __LINE__, errnum and strerror(errnum) + * @param exType The type of the exception; ctor must take file, line, + * message, and error code. + * @param msg The exception message to use. + * @param errnum The errno value. + */ +#define CA_MGM_THROW_ERRNO_MSG1(exType, msg, errnum) \ +throw ::ca_mgm::ExceptionDetail::Errno< exType >:: \ + format(__FILE__, __LINE__, (msg), (errnum)) + + /** * @brief MemoryException class declaration * @@ -71,7 +246,7 @@ * a MemoryException. * */ - BLOCXX_DECLARE_EXCEPTION(Memory); + CA_MGM_DECLARE_EXCEPTION(Memory); /** * @brief RuntimeException class declaration @@ -81,7 +256,7 @@ * calling the failing code. * */ - BLOCXX_DECLARE_EXCEPTION(Runtime); + CA_MGM_DECLARE_EXCEPTION(Runtime); /** * @brief OverflowException class declaration @@ -93,7 +268,7 @@ * type. * */ - BLOCXX_DECLARE_EXCEPTION(Overflow); + CA_MGM_DECLARE_EXCEPTION(Overflow); /** * @brief SyntaxException class declaration @@ -103,7 +278,7 @@ * in the configuration files or similar problems. * */ - BLOCXX_DECLARE_EXCEPTION(Syntax); + CA_MGM_DECLARE_EXCEPTION(Syntax); /** @@ -113,7 +288,7 @@ * E.g. a string should be an email address, but it is not. * */ - BLOCXX_DECLARE_EXCEPTION(Value); + CA_MGM_DECLARE_EXCEPTION(Value); /** * @brief SystemException class declaration @@ -121,7 +296,7 @@ * A system error is thrown in case of reached system limits. * */ - BLOCXX_DECLARE_EXCEPTION(System); + CA_MGM_DECLARE_EXCEPTION(System); } // End of LIMAL_NAMESPACE 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc Sat Jul 10 18:47:47 2010 @@ -6,6 +6,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -106,7 +107,7 @@ } } } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc Sat Jul 10 18:47:47 2010 @@ -107,7 +107,7 @@ } } } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc Sat Jul 10 18:47:47 2010 @@ -6,6 +6,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -83,7 +84,7 @@ } } } - catch(blocxx::Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc Sat Jul 10 18:47:47 2010 @@ -139,7 +139,7 @@ } } } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc Sat Jul 10 18:47:47 2010 @@ -125,7 +125,7 @@ } } } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc Sat Jul 10 18:47:47 2010 @@ -103,7 +103,7 @@ } } } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -128,7 +129,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -48,7 +49,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -81,7 +82,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -76,7 +77,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -217,7 +218,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -209,7 +210,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -136,7 +137,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -136,7 +137,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc Sat Jul 10 18:47:47 2010 @@ -11,6 +11,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -187,7 +188,7 @@ } } } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } @@ -206,7 +207,7 @@ cout << "Got DER Key" << endl; } } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cout << "Got expected Exception." << endl; cerr << "Exception:" << endl << e.getFile() << ": " << e.type() << ": " << e.getErrorCode() << ": "; @@ -235,7 +236,7 @@ cout << "Got PKCS12 data" << endl; } } - catch(Exception &e) + catch(ca_mgm::Exception &e) { cout << "Got expected Exception." << endl; cerr << "Exception:" << endl << e.getFile() << ": " << e.type() << ": " << e.getErrorCode() << ": "; @@ -270,7 +271,7 @@ //cout << pem.data() << endl; } } - catch(Exception &e) + catch(ca_mgm::Exception &e) { cout << "Got expected Exception." << endl; cerr << "Exception:" << endl << e.getFile() << ": " << e.type() << ": " << e.getErrorCode() << ": "; Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc Sat Jul 10 18:47:47 2010 @@ -54,7 +54,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc Sat Jul 10 18:47:47 2010 @@ -292,7 +292,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc Sat Jul 10 18:47:47 2010 @@ -71,7 +71,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc Sat Jul 10 18:47:47 2010 @@ -94,7 +94,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc Sat Jul 10 18:47:47 2010 @@ -153,7 +153,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc Sat Jul 10 18:47:47 2010 @@ -78,7 +78,7 @@ cout << "DONE" << endl; } - catch(blocxx::Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -51,7 +52,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc Sat Jul 10 18:47:47 2010 @@ -103,7 +103,7 @@ cout << "DONE" << endl; } - catch(blocxx::Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc Sat Jul 10 18:47:47 2010 @@ -67,7 +67,7 @@ cout << "DONE" << endl; } - catch(blocxx::Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc Sat Jul 10 18:47:47 2010 @@ -6,6 +6,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -90,7 +91,7 @@ cout << crl.getCRLAsText() << endl; cout << crl.getExtensionsAsText() << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc Sat Jul 10 18:47:47 2010 @@ -6,6 +6,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -85,7 +86,7 @@ cout << cd.getCertificateAsText() << endl; cout << cd.getExtensionsAsText() << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -89,7 +90,7 @@ cout << cd.getCertificateAsText() << endl; cout << cd.getExtensionsAsText() << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc Sat Jul 10 18:47:47 2010 @@ -6,6 +6,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -87,7 +88,7 @@ cout << cd.getExtensionsAsText() << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc Sat Jul 10 18:47:47 2010 @@ -202,7 +202,7 @@ } cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc Sat Jul 10 18:47:47 2010 @@ -80,7 +80,7 @@ } cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -122,7 +123,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -113,7 +114,7 @@ } cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc Sat Jul 10 18:47:47 2010 @@ -8,6 +8,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -120,7 +121,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc Sat Jul 10 18:47:47 2010 @@ -8,6 +8,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -120,7 +121,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc Sat Jul 10 18:47:47 2010 @@ -8,6 +8,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -119,7 +120,7 @@ } cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc Sat Jul 10 18:47:47 2010 @@ -8,6 +8,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -119,7 +120,7 @@ } cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc Sat Jul 10 18:47:47 2010 @@ -7,6 +7,7 @@ #include #include #include +#include #include <iostream> #include <fstream> @@ -79,7 +80,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } 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=2685&r1=2684&r2=2685&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 Jul 10 18:47:47 2010 @@ -1,14 +1,14 @@ -d12f85f32848ae7f9f1d8064813aaa53-1278263331 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de -68b3a1b7290aadfd42361b1b3c14e69a-1278263333 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de -40717a16174dc4d516f6fa7ee8eeb18c-1278263339 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -40717a16174dc4d516f6fa7ee8eeb18c-1278263343 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -40717a16174dc4d516f6fa7ee8eeb18c-1278263346 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -d12f85f32848ae7f9f1d8064813aaa53-1278263357 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de -c293624b6a877f401407ce8f8f1f327e-1278263358 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de -d12f85f32848ae7f9f1d8064813aaa53-1278263359 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de -c1943ae4b9bd7320fae3e29f217483e3-1278263360 /C=DE/CN=Test Request/emailAddress=suse@suse.de -d816690a832b0e52becd255d3a62e975-1278263363 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de -9198f6798d9da70d7cbfb67b610633f5-1278263366 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de -3e248858337c2b46dc67a0f9389376dd-1278263369 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de -bf04fdd95062554800c1556085f47063-1278263372 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de -9797ac11af29f94b82c1e5b0499ab5f2-1278263375 /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de +d12f85f32848ae7f9f1d8064813aaa53-1278780371 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de +68b3a1b7290aadfd42361b1b3c14e69a-1278780373 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de +40717a16174dc4d516f6fa7ee8eeb18c-1278780380 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +40717a16174dc4d516f6fa7ee8eeb18c-1278780384 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +40717a16174dc4d516f6fa7ee8eeb18c-1278780387 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +d12f85f32848ae7f9f1d8064813aaa53-1278780399 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de +c293624b6a877f401407ce8f8f1f327e-1278780401 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de +d12f85f32848ae7f9f1d8064813aaa53-1278780402 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de +c1943ae4b9bd7320fae3e29f217483e3-1278780403 /C=DE/CN=Test Request/emailAddress=suse@suse.de +d816690a832b0e52becd255d3a62e975-1278780406 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de +9198f6798d9da70d7cbfb67b610633f5-1278780408 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de +3e248858337c2b46dc67a0f9389376dd-1278780411 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de +bf04fdd95062554800c1556085f47063-1278780414 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de +9797ac11af29f94b82c1e5b0499ab5f2-1278780415 /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=2685&r1=2684&r2=2685&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 Jul 10 18:47:47 2010 @@ -1,11 +1,11 @@ -V 110704170852Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de -V 110704170853Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de -V 110704170856Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -V 110704170900Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -V 110704170904Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -R 110704170922Z 100704170923Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de -R 110704170923Z 100704170925Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de -R 110704170926Z 100704170929Z,keyTime,20100704165249Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de -R 110704170929Z 100704170932Z,CAkeyTime,20100704165252Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de -R 110704170932Z 100704170934Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de -V 120703170935Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de +V 110710164612Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de +V 110710164613Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de +V 110710164617Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +V 110710164621Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +V 110710164625Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +R 110710164644Z 100710164646Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de +R 110710164646Z 100710164647Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de +R 110710164648Z 100710164651Z,keyTime,20100710163011Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de +R 110710164651Z 100710164653Z,CAkeyTime,20100710163013Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de +R 110710164654Z 100710164654Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de +V 120709164655Z 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=2685&r1=2684&r2=2685&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=2685&r1=2684&r2=2685&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 Jul 10 18:47:47 2010 @@ -1,7 +1,7 @@ -----BEGIN X509 CRL----- MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX -DTEwMDcwNDE3MDkzN1oXDTEwMDcwNTE3MDkzN1owgfAwEgIBAxcNMDUwODE4MTQx +DTEwMDcxMDE2NDY1N1oXDTEwMDcxMTE2NDY1N1owgfAwEgIBAxcNMDUwODE4MTQx MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud @@ -9,10 +9,10 @@ ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ -AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQAK0PZ5ztRnz45zI1/bzQC060as -9QXpYpZtzJWDHCfzlE64d4/EJjoP69clsYqRSsa0JxM+iJHOowIb/FJJQ0S4jJ7R -5H5bbv08kWRqCKmVx8XHJFtfpc+fwMVg6Ut8szDJWUswNWP3zEaZKrMzY3u9FdYq -OZ3nH6vc9pAo5se2Y/c04GSUbQK8ynAOqCeXHmLC0IzVzsw/JaCslypr4DSN7bJx -mnGRRXwGS6U0InAzAJHYSF4yu/13O6QnXlY3moLBJZaPbRuiLrNyWrbjjN4xoQCP -fMvbQFnXwKiL53kK49BkK9lTQ1vukeZAfszCasJI9LIdrBQjDIrMjYTIBBIC +AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQAOcwfD/NxczaBnB27TtG65Bm6d +Yrfi+Y3qY6gxXAsX4XkNDjYjHZEJH4/36BN0NEyqz6AWqB+3WX/96omzDBvNE51D +gEYkZYX9zeoZxWHZPwFz/m0K7zNkiZ5QSkhHfYs+J5p7WZo7meBu7biyhFj+Icm7 +f0IxZo9y/siSP5Q+xkP919K6vKacFExiCVfuHlZ6Kgzub0ckVtAUbX2c2a4kcBcV +5vERTWdNEBxFyNSa3+Cv2J2r7Bi9V9TzEKXqNsDnugboUptwBOdn1T9z69hXDa0S +pNYKX68swGITbRj84LIG9RuJpSpD8eV9G8A4ecDqZD7vZW2vJ8dZ8XS2Hzki -----END X509 CRL----- Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc Sat Jul 10 18:47:47 2010 @@ -64,7 +64,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc Sat Jul 10 18:47:47 2010 @@ -70,7 +70,7 @@ cout << serial << ": Verify success" << endl; } - catch(RuntimeException &e) + catch(ca_mgm::RuntimeException &e) { if(r1.match(e.what())) { @@ -91,7 +91,7 @@ cout << "DONE" << endl; } - catch(Exception& e) + catch(ca_mgm::Exception& e) { cerr << e << endl; } Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc?rev=2685&r1=2684&r2=2685&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc (original) +++ limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc Sat Jul 10 18:47:47 2010 @@ -5,6 +5,7 @@ #include #include #include "INIParser/INIParser.hpp" +#include #include <iostream> #include <fstream> -- To unsubscribe, e-mail: limal-commit+unsubscribe@opensuse.org For additional commands, e-mail: limal-commit+help@opensuse.org