Author: mcalmer Date: Sun Jul 4 16:59:41 2010 New Revision: 2680 URL: http://svn.opensuse.org/viewcvs/limal?rev=2680&view=rev Log: blocxx::COWIntrusiveReference => RWCOW_pointer Modified: limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.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/limal/Makefile.am limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Modified: limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp?rev=2680&r1=2679&r2=2680&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp Sun Jul 4 16:59:41 2010 @@ -23,7 +23,6 @@ #include #include #include -#include #include "Utils.hpp" @@ -33,7 +32,8 @@ using namespace ca_mgm; using namespace blocxx; -class BitExtensionImpl : public blocxx::COWIntrusiveCountableBase +class BitExtensionImpl +//: public blocxx::COWIntrusiveCountableBase { public: BitExtensionImpl() @@ -45,8 +45,8 @@ {} BitExtensionImpl(const BitExtensionImpl& impl) - : COWIntrusiveCountableBase(impl) - , value(impl.value) + : //COWIntrusiveCountableBase(impl) , + value(impl.value) {} ~BitExtensionImpl() {} 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=2680&r1=2679&r2=2680&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp Sun Jul 4 16:59:41 2010 @@ -111,7 +111,7 @@ UrlRef url(getUrlByScheme( components.scheme)); if( !url) { - url = new UrlBase(); + *url = UrlBase(); } url->init(components); @@ -345,7 +345,7 @@ UrlRef url = getUrlByScheme(scheme); if( !url) { - url = new UrlBase(); + *url = UrlBase(); } url->setScheme ( scheme); url->setAuthority ( m_impl->getAuthority()); 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=2680&r1=2679&r2=2680&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp Sun Jul 4 16:59:41 2010 @@ -250,7 +250,7 @@ catch( ... ) { // restore on failure - m_data = saved_data.clone(); + *m_data = *saved_data.clone(); throw; } return *this; @@ -378,7 +378,7 @@ { ca_mgm::url::UrlConfig config(m_data->config); ca_mgm::url::ViewOptions vopts(m_data->vopts); - m_data = new UrlBaseData(); + *m_data = UrlBaseData(); m_data->config = config; m_data->vopts = vopts; } Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/Makefile.am URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/Makefile.am?rev=2680&r1=2679&r2=2680&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/limal/Makefile.am (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/limal/Makefile.am Sun Jul 4 16:59:41 2010 @@ -24,7 +24,8 @@ Date.hpp \ String.hpp \ PerlRegEx.hpp \ - PosixRegEx.hpp + PosixRegEx.hpp \ + PtrTypes.hpp CLEANFILES = *~ Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp?rev=2680&r1=2679&r2=2680&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp Sun Jul 4 16:59:41 2010 @@ -26,7 +26,8 @@ #include #include -#include +//#include +#include // ------------------------------------------------------------------- @@ -172,7 +173,7 @@ * It causes, that if the fragment string is requested using * the WITH_FRAGMENT option, the URL allways contains the "#" * fragment string separator, even if the fragment string is - * empty. + * empty. * This option depends on a enabled WITH_FRAGMENT view * option and is disabled by default. */ @@ -503,7 +504,7 @@ * \endcode * * \param opts A combination of view options. - * \return A string representation of the Url object. + * \return A string representation of the Url object. */ virtual std::string toString(const ca_mgm::url::ViewOptions &opts) const; @@ -1085,7 +1086,7 @@ * It is not required if there is an authority ("//" behind * the "scheme:"), that is in the path-abempty rule, but it * is used e.g. in ftp url's defined by RFC1738. - * + * * We apply this operation in both cases (for all paths), * but if \p authority is true, the encoding of the second * slash depends on the schema configuration (for ftp only). @@ -1167,7 +1168,8 @@ checkValidFragment(const std::string &fragment, EEncoding eflag) const; private: - blocxx::COWReference<UrlBaseData> m_data; + //blocxx::COWReference<UrlBaseData> m_data; + RWCOW_pointer<UrlBaseData> m_data; }; @@ -1175,7 +1177,8 @@ /** * \brief Copy-On-Write Url reference. */ -typedef blocxx::COWReference<UrlBase> UrlRef; +//typedef blocxx::COWReference<UrlBase> UrlRef; +typedef RWCOW_pointer<UrlBase> UrlRef; // ------------------------------------------------------------------- Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp?rev=2680&r1=2679&r2=2680&view=diff ============================================================================== --- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp (original) +++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp Sun Jul 4 16:59:41 2010 @@ -25,14 +25,14 @@ #include #include #include -#include +#include namespace CA_MGM_NAMESPACE { class CA; class CAConfig; class BitExtensionImpl; - + /** * Base Class for Bit Extensions */ @@ -49,7 +49,7 @@ BitExtension& operator=(const BitExtension& extension); #endif - + void setValue(uint32_t value); uint32_t getValue() const; @@ -61,7 +61,8 @@ virtual std::vectorstd::string dump() const = 0; protected: - blocxx::COWIntrusiveReference<BitExtensionImpl> m_impl; + //blocxx::COWIntrusiveReference<BitExtensionImpl> m_impl; + ca_mgm::RWCOW_pointer<BitExtensionImpl> m_impl; }; @@ -82,7 +83,7 @@ encipherOnly = 0x0001, // KU_ENCIPHER_ONLY decipherOnly = 0x8000 // KU_DECIPHER_ONLY }; - + KeyUsageExt(); KeyUsageExt(CAConfig* caConfig, Type type); @@ -98,7 +99,7 @@ KeyUsageExt& operator=(const KeyUsageExt& extension); #endif - + /** * Set a new key usage */ @@ -163,7 +164,7 @@ emailCA = 0x0002, // NS_SMIME_CA objCA = 0x0001 // NS_OBJSIGN_CA }; - + NsCertTypeExt(); NsCertTypeExt(CAConfig* caConfig, Type type); @@ -179,7 +180,7 @@ NsCertTypeExt& operator=(const NsCertTypeExt& extension); #endif - + /** * Set a new certificate type */ @@ -189,7 +190,7 @@ * Return the certificate type */ uint32_t getNsCertType() const; - + /** * Return true if the specified bit is set */ 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=2680&r1=2679&r2=2680&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 Sun Jul 4 16:59:41 2010 @@ -1,14 +1,14 @@ -d12f85f32848ae7f9f1d8064813aaa53-1278234897 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de -68b3a1b7290aadfd42361b1b3c14e69a-1278234898 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de -40717a16174dc4d516f6fa7ee8eeb18c-1278234903 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -40717a16174dc4d516f6fa7ee8eeb18c-1278234907 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -40717a16174dc4d516f6fa7ee8eeb18c-1278234911 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -d12f85f32848ae7f9f1d8064813aaa53-1278234919 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de -c293624b6a877f401407ce8f8f1f327e-1278234920 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de -d12f85f32848ae7f9f1d8064813aaa53-1278234922 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de -c1943ae4b9bd7320fae3e29f217483e3-1278234923 /C=DE/CN=Test Request/emailAddress=suse@suse.de -d816690a832b0e52becd255d3a62e975-1278234926 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de -9198f6798d9da70d7cbfb67b610633f5-1278234929 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de -3e248858337c2b46dc67a0f9389376dd-1278234931 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de -bf04fdd95062554800c1556085f47063-1278234932 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de -9797ac11af29f94b82c1e5b0499ab5f2-1278234934 /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de +d12f85f32848ae7f9f1d8064813aaa53-1278255493 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de +68b3a1b7290aadfd42361b1b3c14e69a-1278255496 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de +40717a16174dc4d516f6fa7ee8eeb18c-1278255501 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +40717a16174dc4d516f6fa7ee8eeb18c-1278255504 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +40717a16174dc4d516f6fa7ee8eeb18c-1278255508 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +d12f85f32848ae7f9f1d8064813aaa53-1278255517 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de +c293624b6a877f401407ce8f8f1f327e-1278255518 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de +d12f85f32848ae7f9f1d8064813aaa53-1278255520 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de +c1943ae4b9bd7320fae3e29f217483e3-1278255521 /C=DE/CN=Test Request/emailAddress=suse@suse.de +d816690a832b0e52becd255d3a62e975-1278255523 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de +9198f6798d9da70d7cbfb67b610633f5-1278255525 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de +3e248858337c2b46dc67a0f9389376dd-1278255526 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de +bf04fdd95062554800c1556085f47063-1278255529 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de +9797ac11af29f94b82c1e5b0499ab5f2-1278255531 /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=2680&r1=2679&r2=2680&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 Sun Jul 4 16:59:41 2010 @@ -1,11 +1,11 @@ -V 110704091458Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de -V 110704091458Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de -V 110704091501Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -V 110704091505Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -V 110704091509Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de -R 110704091524Z 100704091526Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de -R 110704091526Z 100704091528Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de -R 110704091529Z 100704091530Z,keyTime,20100704085850Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de -R 110704091531Z 100704091531Z,CAkeyTime,20100704085851Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de -R 110704091532Z 100704091533Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de -V 120703091534Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de +V 110704145815Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de +V 110704145816Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de +V 110704145819Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +V 110704145822Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +V 110704145826Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de +R 110704145842Z 100704145842Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de +R 110704145843Z 100704145844Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de +R 110704145845Z 100704145846Z,keyTime,20100704144206Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de +R 110704145846Z 100704145848Z,CAkeyTime,20100704144208Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de +R 110704145849Z 100704145850Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de +V 120703145851Z 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=2680&r1=2679&r2=2680&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=2680&r1=2679&r2=2680&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 Sun Jul 4 16:59:41 2010 @@ -1,7 +1,7 @@ -----BEGIN X509 CRL----- MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX -DTEwMDcwNDA5MTU0MFoXDTEwMDcwNTA5MTU0MFowgfAwEgIBAxcNMDUwODE4MTQx +DTEwMDcwNDE0NTg1NFoXDTEwMDcwNTE0NTg1NFowgfAwEgIBAxcNMDUwODE4MTQx MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud @@ -9,10 +9,10 @@ ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ -AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQBNWBHS8UD80HyfguLWbZAiDXnD -IWLDoqc8wqtCWE4EmjFIECJ50oJqmWJl5W2WnNG1a1ShJ/UNQta2Fj4Ao1uX6ss8 -vl0q8nv/b1KXeSy1IKotXfKnakA1vPltp1erJJpIufwcJ1VmSWq5GjZbfDvbd0QO -ZZHUwnj5yXosgrgJ9G/3knqk8AqmbSMYrU96Fgea3+TUb5iVoKNHFYJebApjPHjy -Wq9GyeN2Ucuu+Bww8KMwmqjYktEOZt6w7isutfktKebZ6mxHxiPDnaATGBJj0SWU -mSZuGl1B8iziYcAo8S/qTczrkweQFohApIpvfQ23+71c36vyz5adeth+zzZd +AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQA5akWwtlMM4cAaalAvC4zkhtEO +hh5UlejNJc2qCQGTM0Hl4VcID8qe33v3SYimvB3xRkanROCpW+9gB5rW0y5ZPE74 +M7tjaGVT01gcbxiOet03QyOXr29WQjgvkvWUD19qr4r3fUhiU8ZTXbjCgDgov1Cj +Wy6kM+7zyG1dfLRxlzEQ9acxucqfOCSd+21tPUk7vk5DCZZqO4RURZH1wx+NLmJW +6x4Wj419+1HL5YGspwc0RcE+dhX9Dyj8pCEQKZAJQXmUPvru/nWiJ+Ot0cKB1SZm +1my8tI8TQUApsulvpDiC9piiNsZeXKfTJtqRVBxWyXECFto/KDE7dNUzrmVK -----END X509 CRL----- -- To unsubscribe, e-mail: limal-commit+unsubscribe@opensuse.org For additional commands, e-mail: limal-commit+help@opensuse.org