Author: mcalmer
Date: Tue Aug 10 18:53:19 2010
New Revision: 2692
URL: http://svn.opensuse.org/viewcvs/limal?rev=2692&view=rev
Log:
remove blocxx references from ini parser
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.cpp
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h
limal-branches/mc-devel/limal-ca-mgm/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_CA1/serial
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/INIParser/INIParser.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.cpp?rev=2692&r1=2691&r2=2692&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.cpp Tue Aug 10 18:53:19 2010
@@ -28,8 +28,6 @@
#include "Utils.hpp"
-using namespace blocxx;
-
// ===================================================================
namespace LIMAL_NAMESPACE
{
@@ -111,7 +109,7 @@
{}
// -------------------------------------------------------------------
-Section::Section(const blocxx::IntrusiveReference<IniParser> &parser)
+Section::Section(IniParser *parser)
: m_path()
, m_parser(parser)
{
@@ -685,8 +683,8 @@
// -------------------------------------------------------------------
INIParser::~INIParser ()
{
- if (parser->isStarted())
- parser->write();
+ if (parser && parser->isStarted())
+ parser->write();
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp?rev=2692&r1=2691&r2=2692&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp Tue Aug 10 18:53:19 2010
@@ -36,8 +36,6 @@
#include <list>
#include <vector>
#include
-//#include
-#include
#include "INIParser/INIParserDescr.hpp"
namespace LIMAL_NAMESPACE
@@ -113,7 +111,7 @@
* This constructor will only be used for creating the toplevel
* section
*/
- Section(const blocxx::IntrusiveReference<IniParser> &parser);
+ Section(IniParser *parser);
public:
Section();
@@ -322,7 +320,7 @@
private:
std::vectorstd::string m_path;
- blocxx::IntrusiveReference<IniParser> m_parser;
+ IniParser *m_parser;
};
@@ -461,7 +459,7 @@
{
private:
friend class Section;
- blocxx::IntrusiveReference<IniParser> parser;
+ IniParser *parser;
public:
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h?rev=2692&r1=2691&r2=2692&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h Tue Aug 10 18:53:19 2010
@@ -18,7 +18,6 @@
#include
#include
-#include
#include "INIParser/INIParserDescr.hpp"
#include <list>
#include <map>
@@ -232,7 +231,8 @@
// were never actuially used
/** The parser, queried about global settings */
- blocxx::IntrusiveReference<IniParser> ip;
+ //blocxx::IntrusiveReference<IniParser> ip;
+ const IniParser *ip;
/**
* if this is global section, there may be comment at the end
@@ -440,7 +440,7 @@
//, logger(INIPARSER)
{}
- IniSection (const blocxx::IntrusiveReference<IniParser> &p)
+ IniSection (const IniParser *p)
: IniBase (-1),
ip (p),
end_comment (), rewrite_by(-1),
@@ -481,7 +481,7 @@
* @param ip parser to take options from
* @param n name of section
*/
- IniSection (const blocxx::IntrusiveReference<IniParser> &p, std::string n)
+ IniSection (const IniParser *p, std::string n)
: IniBase (n),
ip (p),
end_comment (), rewrite_by(0),
@@ -643,7 +643,7 @@
_t (VALUE),
_e (e),
// _s (IniSection ("uninitialized"))
- _s (IniSection (blocxx::IntrusiveReference<IniParser>()))
+ _s (IniSection ((const IniParser*)NULL))
{}
/// construct from a section
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=2692&r1=2691&r2=2692&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 Tue Aug 10 18:53:19 2010
@@ -0,0 +1,14 @@
+d12f85f32848ae7f9f1d8064813aaa53-1281458957 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+68b3a1b7290aadfd42361b1b3c14e69a-1281458958 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1281458963 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1281458966 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1281458969 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1281458978 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+c293624b6a877f401407ce8f8f1f327e-1281458979 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1281458980 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+c1943ae4b9bd7320fae3e29f217483e3-1281458981 /C=DE/CN=Test Request/emailAddress=suse@suse.de
+d816690a832b0e52becd255d3a62e975-1281458984 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
+9198f6798d9da70d7cbfb67b610633f5-1281458986 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
+3e248858337c2b46dc67a0f9389376dd-1281458988 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
+bf04fdd95062554800c1556085f47063-1281458989 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
+9797ac11af29f94b82c1e5b0499ab5f2-1281458992 /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=2692&r1=2691&r2=2692&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 Tue Aug 10 18:53:19 2010
@@ -0,0 +1,11 @@
+V 110810164918Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de
+V 110810164918Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de
+V 110810164920Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+V 110810164923Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+V 110810164926Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+R 110810164942Z 100810164943Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de
+R 110810164944Z 100810164946Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
+R 110810164946Z 100810164947Z,keyTime,20100810163307Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
+R 110810164948Z 100810164948Z,CAkeyTime,20100810163308Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
+R 110810164949Z 100810164951Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
+V 120809164952Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/serial
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/serial?rev=2692&r1=2691&r2=2692&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/serial (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/serial Tue Aug 10 18:53:19 2010
@@ -1 +1 @@
-01
\ No newline at end of file
+0C
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=2692&r1=2691&r2=2692&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=2692&r1=2691&r2=2692&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 Tue Aug 10 18:53:19 2010
@@ -1,7 +1,7 @@
-----BEGIN X509 CRL-----
MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV
BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX
-DTEwMDcxNzE2MzYxNloXDTEwMDcxODE2MzYxNlowgfAwEgIBAxcNMDUwODE4MTQx
+DTEwMDgxMDE2NDk1M1oXDTEwMDgxMTE2NDk1M1owgfAwEgIBAxcNMDUwODE4MTQx
MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG
ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud
GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud
@@ -9,10 +9,10 @@
ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA
FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE
AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ
-AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQBRgzzcV4mcVj5oCUOSCVXI6XlS
-8A1bw5j8lcMgZ1hybzXxi2ZnuzDySFVZ67StiVA+5xWzuZ1iEpaO4peYmamHZsQ8
-qaCrxbg3TJQCR5pleaDXMTQbMneh9bKCyzCOHetI52kgly0x0zwx8lrdVFnOKHhH
-qyzBasu/J/DVnCG73kSmbZJnYWMSFI4V09Z5G03H1R0yWDf+V/rFHf4j9vYphcE1
-csZdnZq81nMpL7/m1DfoYTAF/Y2rwn/upmzqJm6Hf137GVnfDmL2C1hnQbhC4VoA
-ai/P3xXiifSzWkAWZocg1Niv5Zqr8C0wsfdOr+cQXjAHmmsTjlDDs9ha9kRZ
+AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQBL2rnMcrdmYLFb3Oee65AeDjSk
+3Fd3QkXZtv4tHhy7+LGRWb6iwCz3JUzAmha6aXqHBxfN8GhWK3eRdodoZpB2CqwD
+SbrHeZgrbP6/KS5BpXOR6CuwAB8sjIFurKtHEmFTn2Ds9kEGyTna00Sy8EpliIve
+07Zyor6WCU7gOeahHaC5/A9LY8y59mxFkVzezLcsDgzH6apkBUqLzTk+M22Aa55O
+pHcaEIidav8IbYs+8VmbsaavXPANxUVQ6ffGwdmSukGfyVlVwZx6gu6jhVKkp1rk
+n0yFjMy3bIclm9OR/RL8RCevysoRcW5m9jCq9I5VALRENu4/W7SlpRqXgHox
-----END X509 CRL-----
--
To unsubscribe, e-mail: limal-commit+unsubscribe@opensuse.org
For additional commands, e-mail: limal-commit+help@opensuse.org
