July 2008 - Limal Commits - openSUSE Mailing Lists

r2536 - /limal-tags/stable-1_5_0/limal-ca-mgm/
by mcalmer＠svn.opensuse.org 01 Jul '08

01 Jul '08

Author: mcalmer Date: Tue Jul 1 16:09:06 2008 New Revision: 2536 URL: http://svn.opensuse.org/viewcvs/limal?rev=2536&view=rev Log: Created tag stable-1_5_0 for limal-ca-mgm Added: limal-tags/stable-1_5_0/limal-ca-mgm/ - copied from r2535, limal-head/limal-ca-mgm/ -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2535 - /limal-tags/stable-1_5_0/
by mcalmer＠svn.opensuse.org 01 Jul '08

01 Jul '08

Author: mcalmer Date: Tue Jul 1 16:09:05 2008 New Revision: 2535 URL: http://svn.opensuse.org/viewcvs/limal?rev=2535&view=rev Log: Created tag stable-1_5_0 Added: limal-tags/stable-1_5_0/ -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2534 - in /limal-head/limal-ca-mgm: VERSION package/limal-ca-mgm.changes
by mcalmer＠svn.opensuse.org 01 Jul '08

01 Jul '08

Author: mcalmer Date: Tue Jul 1 16:01:41 2008 New Revision: 2534 URL: http://svn.opensuse.org/viewcvs/limal?rev=2534&view=rev Log: version 1.5.0 Modified: limal-head/limal-ca-mgm/VERSION limal-head/limal-ca-mgm/package/limal-ca-mgm.changes Modified: limal-head/limal-ca-mgm/VERSION URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/VERSION?rev=2… ============================================================================== --- limal-head/limal-ca-mgm/VERSION (original) +++ limal-head/limal-ca-mgm/VERSION Tue Jul 1 16:01:41 2008 @@ -1 +1 @@ -1.4.10 +1.5.0 Modified: limal-head/limal-ca-mgm/package/limal-ca-mgm.changes URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/package/limal… ============================================================================== --- limal-head/limal-ca-mgm/package/limal-ca-mgm.changes (original) +++ limal-head/limal-ca-mgm/package/limal-ca-mgm.changes Tue Jul 1 16:01:41 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 1 12:04:45 CEST 2008 - mc(a)suse.de + +- version 1.5.0 +- support IPv6 addresses in LiteralValue IP + +------------------------------------------------------------------- Fri Jun 6 10:25:09 CEST 2008 - mc(a)suse.de - version 1.4.10 -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2533 - in /limal-head/limal-ca-mgm: src/Utils.hpp testsuite/IPv6CheckTest.cc testsuite/Makefile.am testsuite/single.out/IPv6CheckTest.err testsuite/single.out/IPv6CheckTest.out
by mcalmer＠svn.opensuse.org 01 Jul '08

01 Jul '08

Author: mcalmer Date: Tue Jul 1 15:38:48 2008 New Revision: 2533 URL: http://svn.opensuse.org/viewcvs/limal?rev=2533&view=rev Log: - fix initIP6Check - add testcase for IPv6 addresses Added: limal-head/limal-ca-mgm/testsuite/IPv6CheckTest.cc limal-head/limal-ca-mgm/testsuite/single.out/IPv6CheckTest.err limal-head/limal-ca-mgm/testsuite/single.out/IPv6CheckTest.out Modified: limal-head/limal-ca-mgm/src/Utils.hpp limal-head/limal-ca-mgm/testsuite/Makefile.am Modified: limal-head/limal-ca-mgm/src/Utils.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Utils.hpp… ============================================================================== --- limal-head/limal-ca-mgm/src/Utils.hpp (original) +++ limal-head/limal-ca-mgm/src/Utils.hpp Tue Jul 1 15:38:48 2008 @@ -154,7 +154,18 @@ inline limal::ValueCheck initIP6Check() { limal::ValueCheck checkIP = - limal::ValueCheck(new limal::ValuePosixRECheck("^([0-9a-fA-F]{0,4}:){7}[0-9a-fA-F]{0,4}$")); + limal::ValueCheck(new limal::ValuePosixRECheck("^([0-9a-fA-F]{1,4}:){7}([0-9a-fA-F]){1,4}$")) + .Or(new limal::ValuePosixRECheck("^:(:[0-9a-fA-F]{1,4}){1,6}$")) + .Or(new limal::ValuePosixRECheck("^([0-9a-fA-F]{1,4}:){1,6}:$")) + .Or( + limal::ValueCheck( + limal::ValueCheck( new limal::ValuePosixRECheck( "^(([0-9a-fA-F]{1,4}):){1,6}(:([0-9a-fA-F]{1,4})){1,6}$")) + ).And( + limal::ValueCheck( new limal::ValuePosixRECheck("^([^:]*:){8,}")).Not() + ).And( + limal::ValueCheck( new limal::ValuePosixRECheck("::.*::") ).Not() + ) + ); return checkIP; } Added: limal-head/limal-ca-mgm/testsuite/IPv6CheckTest.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/IPv… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/IPv6CheckTest.cc (added) +++ limal-head/limal-ca-mgm/testsuite/IPv6CheckTest.cc Tue Jul 1 15:38:48 2008 @@ -0,0 +1,82 @@ +#include <blocxx/Logger.hpp> +#include <blocxx/AppenderLogger.hpp> +#include <blocxx/CerrLogger.hpp> +#include <blocxx/CerrAppender.hpp> +#include <blocxx/String.hpp> +#include <blocxx/PerlRegEx.hpp> +#include <limal/Logger.hpp> +#include <limal/PathInfo.hpp> +#include <limal/ca-mgm/CA.hpp> +#include <limal/Exception.hpp> +#include <limal/ValueCheck.hpp> +#include "Utils.hpp" + +#include <iostream> +#include <fstream> +#include <unistd.h> + +using namespace blocxx; +using namespace limal; +using namespace limal::ca_mgm; +using namespace std; + +int main() +{ + try + { + cout << "START" << endl; + + blocxx::StringArray cat; + cat.push_back("FATAL"); + cat.push_back("ERROR"); + cat.push_back("INFO"); + //cat.push_back("DEBUG"); + + // Logging + LoggerRef l = limal::Logger::createCerrLogger( + "IPv6CheckTest", + LogAppender::ALL_COMPONENTS, + cat, + "%-5p %c - %m" + ); + limal::Logger::setDefaultLogger(l); + + cout << "=================== start Test ======================" << endl; + + ValueCheck check = initIP6Check(); + + blocxx::StringArray iparr ; + iparr.push_back("2001:780:101:a00:211:11ff:fee6:a5af"); + iparr.push_back("fe80::211:11ff:fee6:a5af"); + iparr.push_back("2001::a5af"); + iparr.push_back("fe80:1:211:11ff:fee6::"); + + iparr.push_back("fe80::211::fee6:a5af"); + iparr.push_back("2001:780:101:a00:211:11ff:fee6:a5af:afff"); + iparr.push_back("g001:780:101:a00:211:11ff:fee6:a5af"); + + StringArray::const_iterator ip_it; + for(ip_it = iparr.begin(); ip_it != iparr.end(); ++ip_it) + { + //cout << "Explain: "<< check.explain(*ip_it) << endl; + if(check.isValid((*ip_it))) + { + cout << *ip_it << " => is valid" << endl; + } + else + { + cout << *ip_it << " => is not valid" << endl; + } + } + + cout << "DONE" << endl; + } + catch(Exception& e) + { + cerr << e << endl; + } + + return 0; +} + +/* vim: set ts=8 sts=8 sw=8 ai noet: */ Modified: limal-head/limal-ca-mgm/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/Mak… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/Makefile.am (original) +++ limal-head/limal-ca-mgm/testsuite/Makefile.am Tue Jul 1 15:38:48 2008 @@ -33,7 +33,7 @@ ImportCommonCertificateTest.single \ ConvertTest.single iniParser.multi \ sysConfig.single RequestTest.single \ - CRLTest.single + CRLTest.single IPv6CheckTest.single CAConfig_single_SOURCES = CAConfig.cc @@ -119,6 +119,8 @@ CRLTest_single_SOURCES = CRLTest.cc +IPv6CheckTest_single_SOURCES = IPv6CheckTest.cc + clean-local: rm -f tmp.err.* tmp.out.* site.exp site.bak openssl.cnf.tmpl.test rm -f *~ limal.log limal.sum .rnd Added: limal-head/limal-ca-mgm/testsuite/single.out/IPv6CheckTest.err URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/sin… ============================================================================== (empty) Added: limal-head/limal-ca-mgm/testsuite/single.out/IPv6CheckTest.out URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/sin… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/single.out/IPv6CheckTest.out (added) +++ limal-head/limal-ca-mgm/testsuite/single.out/IPv6CheckTest.out Tue Jul 1 15:38:48 2008 @@ -0,0 +1,10 @@ +START +=================== start Test ====================== +2001:780:101:a00:211:11ff:fee6:a5af => is valid +fe80::211:11ff:fee6:a5af => is valid +2001::a5af => is valid +fe80:1:211:11ff:fee6:: => is valid +fe80::211::fee6:a5af => is not valid +2001:780:101:a00:211:11ff:fee6:a5af:afff => is not valid +g001:780:101:a00:211:11ff:fee6:a5af => is not valid +DONE -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0

r2532 - in /limal-head/limal-ca-mgm: src/ testsuite/ testsuite/single.out/
by mcalmer＠svn.opensuse.org 01 Jul '08

01 Jul '08

Author: mcalmer Date: Tue Jul 1 12:04:04 2008 New Revision: 2532 URL: http://svn.opensuse.org/viewcvs/limal?rev=2532&view=rev Log: - LiteralValue IP can contain an IPv6 address * rename initIPCheck to initIP4Check * add initIP6Check * modify extension parsing to parse IPv6 addresses * modify testcase to test IPv6 addresses Modified: limal-head/limal-ca-mgm/src/LiteralValues.cpp limal-head/limal-ca-mgm/src/LiteralValues_Priv.cpp limal-head/limal-ca-mgm/src/Utils.hpp limal-head/limal-ca-mgm/testsuite/CertificateTest3.cc limal-head/limal-ca-mgm/testsuite/CertificateTest5.cc limal-head/limal-ca-mgm/testsuite/single.out/CertificateTest5.out Modified: limal-head/limal-ca-mgm/src/LiteralValues.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/LiteralVa… ============================================================================== --- limal-head/limal-ca-mgm/src/LiteralValues.cpp (original) +++ limal-head/limal-ca-mgm/src/LiteralValues.cpp Tue Jul 1 12:04:04 2008 @@ -333,11 +333,16 @@ } else if(m_impl->literalType == "IP") { - ValueCheck check = initIPCheck(); + ValueCheck check = initIP4Check(); if(!check.isValid(m_impl->literalValue)) { - LOGIT_DEBUG("Wrong LiteralValue for type 'IP': " << m_impl->literalValue); - return false; + // IPv6 address is allowed too + check = initIP6Check(); + if(!check.isValid(m_impl->literalValue)) + { + LOGIT_DEBUG("Wrong LiteralValue for type 'IP': " << m_impl->literalValue); + return false; + } } } else if(m_impl->literalType == "1.3.6.1.4.1.311.20.2.3") // ms_upn @@ -419,12 +424,17 @@ } else if(m_impl->literalType == "IP") { - ValueCheck check = initIPCheck(); + ValueCheck check = initIP4Check(); if(!check.isValid(m_impl->literalValue)) { - LOGIT_DEBUG("Wrong LiteralValue for type 'IP': " << m_impl->literalValue); - result.append(Format("Wrong LiteralValue for type 'IP': %1", - m_impl->literalValue).toString()); + // IPv6 address is allowed too + check = initIP6Check(); + if(!check.isValid(m_impl->literalValue)) + { + LOGIT_DEBUG("Wrong LiteralValue for type 'IP': " << m_impl->literalValue); + result.append(Format("Wrong LiteralValue for type 'IP': %1", + m_impl->literalValue).toString()); + } } } else if(m_impl->literalType == "1.3.6.1.4.1.311.20.2.3") // ms_upn Modified: limal-head/limal-ca-mgm/src/LiteralValues_Priv.cpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/LiteralVa… ============================================================================== --- limal-head/limal-ca-mgm/src/LiteralValues_Priv.cpp (original) +++ limal-head/limal-ca-mgm/src/LiteralValues_Priv.cpp Tue Jul 1 12:04:04 2008 @@ -85,9 +85,10 @@ LiteralValue_Priv::LiteralValue_Priv(GENERAL_NAME *gen) : LiteralValue() { - char oline[256]; + char oline[256], htmp[5]; unsigned char *p = NULL; int nid = 0; + int i; ASN1_OBJECT *id_ms_san_upn; ASN1_OBJECT *id_pkinit_san; @@ -131,13 +132,29 @@ case GEN_IPADD: p = gen->d.ip->data; /* BUG: doesn't support IPV6 */ - if(gen->d.ip->length != 4) { - LOGIT_ERROR("Invalid IP Address: maybe IPv6"); - BLOCXX_THROW(limal::SyntaxException, "Invalid IP Address: maybe IPv6"); + if(gen->d.ip->length == 4) { + BIO_snprintf(oline, sizeof oline, + "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); + } + else if(gen->d.ip->length == 16) + { + oline[0] = 0; + for (i = 0; i < 8; i++) + { + BIO_snprintf(htmp, sizeof htmp, + "%X", p[0] << 8 | p[1]); + p += 2; + strcat(oline, htmp); + if (i != 7) + strcat(oline, ":"); + } + } + else + { + LOGIT_ERROR("Invalid IP Address"); + BLOCXX_THROW(limal::SyntaxException, "Invalid IP Address"); break; } - BIO_snprintf(oline, sizeof oline, - "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); setLiteral("IP", oline); break; case GEN_RID: Modified: limal-head/limal-ca-mgm/src/Utils.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/src/Utils.hpp… ============================================================================== --- limal-head/limal-ca-mgm/src/Utils.hpp (original) +++ limal-head/limal-ca-mgm/src/Utils.hpp Tue Jul 1 12:04:04 2008 @@ -145,13 +145,20 @@ return checkDNS; } -inline limal::ValueCheck initIPCheck() { +inline limal::ValueCheck initIP4Check() { limal::ValueCheck checkIP = limal::ValueCheck(new limal::ValuePosixRECheck("^([0-9]{1,3}\\.){3}[0-9]{1,3}$")); return checkIP; } +inline limal::ValueCheck initIP6Check() { + limal::ValueCheck checkIP = + limal::ValueCheck(new limal::ValuePosixRECheck("^([0-9a-fA-F]{0,4}:){7}[0-9a-fA-F]{0,4}$")); + + return checkIP; +} + inline limal::ValueCheck initAccessOIDCheck() { limal::ValueCheck checkAccessOID = limal::ValueCheck(new limal::ValuePosixRECheck("^(OCSP|caIssuers)$")) Modified: limal-head/limal-ca-mgm/testsuite/CertificateTest3.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/Cer… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/CertificateTest3.cc (original) +++ limal-head/limal-ca-mgm/testsuite/CertificateTest3.cc Tue Jul 1 12:04:04 2008 @@ -121,6 +121,7 @@ List<LiteralValue> list; list.push_back(LiteralValue("IP", "164.34.35.184")); + list.push_back(LiteralValue("IP", "2001:780:101:a00:211:11ff:fee6:a5af")); list.push_back(LiteralValue("DNS", "ca.my-company.com")); list.push_back(LiteralValue("RID", "1.2.3.4")); list.push_back(LiteralValue("email", "me(a)my-company.com")); Modified: limal-head/limal-ca-mgm/testsuite/CertificateTest5.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/Cer… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/CertificateTest5.cc (original) +++ limal-head/limal-ca-mgm/testsuite/CertificateTest5.cc Tue Jul 1 12:04:04 2008 @@ -98,6 +98,7 @@ list.push_back(LiteralValue("1.3.6.1.5.2.2", "me(a)MY-COMPANY.COM")); // krb5PrincipalName list.push_back(LiteralValue("1.3.6.1.4.1.311.20.2.3", "me/admin(a)MY-COMPANY.COM")); // ms_upn list.push_back(LiteralValue("1.3.6.1.5.2.2", "me/admin(a)MY-COMPANY.COM")); // krb5PrincipalName + list.push_back(LiteralValue("IP", "2001:780:101:a00:211:11ff:fee6:a5af")); // IPv6 address cid.extensions().subjectAlternativeName().setCopyEmail(true); cid.extensions().subjectAlternativeName().setAlternativeNameList(list); Modified: limal-head/limal-ca-mgm/testsuite/single.out/CertificateTest5.out URL: http://svn.opensuse.org/viewcvs/limal/limal-head/limal-ca-mgm/testsuite/sin… ============================================================================== --- limal-head/limal-ca-mgm/testsuite/single.out/CertificateTest5.out (original) +++ limal-head/limal-ca-mgm/testsuite/single.out/CertificateTest5.out Tue Jul 1 12:04:04 2008 @@ -84,6 +84,8 @@ 1.3.6.1.4.1.311.20.2.3:me/admin@MY-COMPANY.COM LiteralValue::dump() 1.3.6.1.5.2.2:me/admin@MY-COMPANY.COM +LiteralValue::dump() +IP:2001:780:101:A00:211:11FF:FEE6:A5AF IssuerAlternativeNameExt::dump() ExtensionBase::dump() is Present = true @@ -103,6 +105,8 @@ 1.3.6.1.4.1.311.20.2.3:me/admin@MY-COMPANY.COM LiteralValue::dump() 1.3.6.1.5.2.2:me/admin@MY-COMPANY.COM +LiteralValue::dump() +IP:2001:780:101:A00:211:11FF:FEE6:A5AF AuthorityInfoAccessExt::dump() ExtensionBase::dump() is Present = false -- To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: limal-commit+help(a)opensuse.org

1 0