Author: mcalmer Date: Mon Nov 9 14:29:54 2009 New Revision: 2634 URL: http://svn.opensuse.org/viewcvs/limal?rev=2634&view=rev Log: - version 1.5.20 - allow DNS names starting with a number [bnc#537786] Added: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/CertificateTest6.cc limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest6.err limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest6.out Modified: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/VERSION limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/package/limal-ca-mgm.changes limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/src/Utils.hpp limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/CertificateTest5.cc limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/Makefile.am limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest5.out Modified: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/VERSION URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/VERSION?rev=2634&r1=2633&r2=2634&view=diff ============================================================================== --- limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/VERSION (original) +++ limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/VERSION Mon Nov 9 14:29:54 2009 @@ -1 +1 @@ -1.5.6 +1.5.20 Modified: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/package/limal-ca-mgm.changes URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/package/limal-ca-mgm.changes?rev=2634&r1=2633&r2=2634&view=diff ============================================================================== --- limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/package/limal-ca-mgm.changes (original) +++ limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/package/limal-ca-mgm.changes Mon Nov 9 14:29:54 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 9 14:27:53 CET 2009 - mc@suse.de + +- version 1.5.20 +- allow DNS names starting with a number [bnc#537786] + +------------------------------------------------------------------- Fri Jan 23 09:55:26 CET 2009 - mc@suse.de - version 1.5.6 Modified: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/src/Utils.hpp URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/src/Utils.hpp?rev=2634&r1=2633&r2=2634&view=diff ============================================================================== --- limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/src/Utils.hpp (original) +++ limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/src/Utils.hpp Mon Nov 9 14:29:54 2009 @@ -140,7 +140,7 @@ inline limal::ValueCheck initDNSCheck() { limal::ValueCheck checkDNS = - limal::ValueCheck(new limal::ValuePosixRECheck("^[a-z]+[a-z0-9.-]*$")); + limal::ValueCheck(new limal::ValuePosixRECheck("^[^ ]+$")); return checkDNS; } Modified: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/CertificateTest5.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/CertificateTest5.cc?rev=2634&r1=2633&r2=2634&view=diff ============================================================================== --- limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/CertificateTest5.cc (original) +++ limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/CertificateTest5.cc Mon Nov 9 14:29:54 2009 @@ -93,6 +93,7 @@ List<LiteralValue> list; list.push_back(LiteralValue("DNS", "ca.my-company.com")); + list.push_back(LiteralValue("DNS", "127-55-2-80ca.my-company.com")); list.push_back(LiteralValue("email", "me@my-company.com")); list.push_back(LiteralValue("1.3.6.1.4.1.311.20.2.3", "me@MY-COMPANY.COM")); // ms_upn list.push_back(LiteralValue("1.3.6.1.5.2.2", "me@MY-COMPANY.COM")); // krb5PrincipalName Added: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/CertificateTest6.cc URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/CertificateTest6.cc?rev=2634&view=auto ============================================================================== --- limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/CertificateTest6.cc (added) +++ limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/CertificateTest6.cc Mon Nov 9 14:29:54 2009 @@ -0,0 +1,147 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include <iostream> +#include <fstream> +#include + +using namespace blocxx; +using namespace limal; +using namespace limal::ca_mgm; +using namespace std; + +int main() +{ + sleep( 2 ); // We have a request with the same name. So sleep 2 sec. to get a difference in the timestamp + 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( + "CertificateTest6", + LogAppender::ALL_COMPONENTS, + cat, + "%-5p %c - %m" + ); + limal::Logger::setDefaultLogger(l); + + CA ca("Test_CA1", "system", "./TestRepos/"); + RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req); + + // ------------------------ Set DN -------------------------------- + + List<RDNObject> dnl = rgd.getSubjectDN().getDN(); + List<RDNObject>::iterator dnit; + + for(dnit = dnl.begin(); dnit != dnl.end(); ++dnit) + { + cout << "DN Key " << (*dnit).getType() << endl; + + if((*dnit).getType() == "countryName") + { + (*dnit).setRDNValue("DE"); + } + else if((*dnit).getType() == "commonName") + { + (*dnit).setRDNValue("Full Test Certificate"); + } + else if((*dnit).getType() == "emailAddress") + { + (*dnit).setRDNValue("suse@suse.de"); + } + } + + DNObject dn(dnl); + rgd.setSubjectDN(dn); + + // ------------------------ create request -------------------------------- + + blocxx::String r = ca.createRequest("system", rgd, E_Client_Req); + + cout << "RETURN Request " << endl; + + // ------------------------ get issue defaults -------------------------------- + + CertificateIssueData cid = ca.getIssueDefaults(E_Client_Cert); + + // ------------------------ create bit extension ----------------------------- + + cid.extensions().keyUsage().setKeyUsage(KeyUsageExt::decipherOnly); + cid.extensions().nsCertType().setNsCertType(NsCertTypeExt::objCA | + NsCertTypeExt::emailCA | + NsCertTypeExt::sslCA); + + // ----------------- create basic constrains extension ----------------------- + + cid.extensions().basicConstraints().setBasicConstraints(true, 3); + + // ------------------------ create alternative extension ----------------------------- + + List<LiteralValue> list; + list.push_back(LiteralValue("DNS", "ca.my-company.com")); + list.push_back(LiteralValue("DNS", "127-55-2-80 ca.my-company.com")); + list.push_back(LiteralValue("email", "me@my-company.com")); + list.push_back(LiteralValue("1.3.6.1.4.1.311.20.2.3", "me@MY-COMPANY.COM")); // ms_upn + list.push_back(LiteralValue("1.3.6.1.5.2.2", "me@MY-COMPANY.COM")); // krb5PrincipalName + list.push_back(LiteralValue("1.3.6.1.4.1.311.20.2.3", "me/admin@MY-COMPANY.COM")); // ms_upn + list.push_back(LiteralValue("1.3.6.1.5.2.2", "me/admin@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); + cid.extensions().issuerAlternativeName().setCopyIssuer(true); + cid.extensions().issuerAlternativeName().setAlternativeNameList(list); + + + blocxx::String c = ca.issueCertificate(r, cid, E_CA_Cert); + + //sleep(10000); + + cout << "RETURN Certificate " << endl; + + path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem"); + + cout << "Certificate exists: " << Bool(pi.exists()) << endl; + + CertificateData cd = ca.getCertificate(c); + + StringArray ret = cd.getExtensions().dump(); + StringArray::const_iterator it; + + for(it = ret.begin(); it != ret.end(); ++it) + { + if((*it).startsWith("KeyID")) + { + cout << "found KeyID" << endl; + } + else + { + cout << (*it) << endl; + } + } + + cout << "DONE" << endl; + } + catch(Exception& e) + { + cerr << e << endl; + } + + return 0; +} + +/* vim: set ts=8 sts=8 sw=8 ai noet: */ Modified: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/Makefile.am?rev=2634&r1=2633&r2=2634&view=diff ============================================================================== --- limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/Makefile.am (original) +++ limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/Makefile.am Mon Nov 9 14:29:54 2009 @@ -25,7 +25,7 @@ RemoveRequestTest.single RevxRemoveCertificateTest.single \ VerifyTest.single ParseCATest.single \ CertificateTest3.single CertificateTest4.single \ - CertificateTest5.single ParseCertificateTest.multi \ + CertificateTest5.single CertificateTest6.single ParseCertificateTest.multi \ ParseCertificateTest2.multi ParseRequestTest.multi ParseCRLTest.multi \ RevokeTest5.single ImportRequestTest.single \ DeleteCATest.single ImportCATest.single \ @@ -65,6 +65,8 @@ CertificateTest5_single_SOURCES = CertificateTest5.cc +CertificateTest6_single_SOURCES = CertificateTest6.cc + RevokeTest_single_SOURCES = RevokeTest.cc RevokeTest2_single_SOURCES = RevokeTest2.cc Modified: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand?rev=2634&r1=2633&r2=2634&view=diff ============================================================================== Binary files - no diff available. Modified: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem?rev=2634&r1=2633&r2=2634&view=diff ============================================================================== --- limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem (original) +++ limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Mon Nov 9 14:29:54 2009 @@ -1,7 +1,7 @@ -----BEGIN X509 CRL----- MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX -DTA3MDkyODE0MTIwMloXDTA3MDkyOTE0MTIwMlowgfAwEgIBAxcNMDUwODE4MTQx +DTA5MDkxMDA4NTkwOVoXDTA5MDkxMTA4NTkwOVowgfAwEgIBAxcNMDUwODE4MTQx MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud @@ -9,10 +9,10 @@ ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ -AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQCsHzxUgsZXcDucG1hknMq2spUr -Arg9r8w+o7wzAWr9jxq74JeNpn8atXNeQbe4VVksL5cKiT3csoS+5mOdKEM5yOm8 -Pb/zDwz5a4MNnDawDLk4nh+PZFHZcpdSxWBee2Ag7oY68CwbOy9QbfLeozRrHgjU -csL8gCvNdIaLtARy6CWC7aJ3tQ9sjcW16jtMcXYB+4ugkfkH2NWzW4290akIM7a+ -pB8OXOrte03iQjk7cG+hYqGmvfqMBdiKUO8ir3ja5zReHx/uWn6Mg2c9Msdy9wgY -u9lueuQe7x82ZLaQUJQ0AAE3IRX2jYexVoTa4ZDyN0M4H8wXNyItVX+XlzmC +AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQAKehAnM4ipQEj7sfCbnfbEzmpp +G3niTcwoFxrjmm1pfxEpfnL1Hgj2ER1tGJZ05MODjLp6spz4fTR1f8gDggCb5SI3 +7XTpAbxxp6T883emTzYgz9c4s2wVFYxtii/nUkuW9d2+ewZOmRVl/TzVk2fvGADe +SnT39Fo3PoXJYFLZePg9OO+SO/xxCek3GP5JcrX9hBnyElvul8xEEn+CvB17O902 +cexT8F4n1appIlgBWLo7fkohvsOf6qqo1XXVeX7z3s2gTRpppMLN3l7GXlXhrvmR +jKjvAq3A0IxrXduuUc2xJgmq+z8HpPd3sl6fL1d2TFvuKyBi8/mZIk97FeFG -----END X509 CRL----- Modified: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest5.out URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest5.out?rev=2634&r1=2633&r2=2634&view=diff ============================================================================== --- limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest5.out (original) +++ limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest5.out Mon Nov 9 14:29:54 2009 @@ -75,6 +75,8 @@ LiteralValue::dump() DNS:ca.my-company.com LiteralValue::dump() +DNS:127-55-2-80ca.my-company.com +LiteralValue::dump() email:me@my-company.com LiteralValue::dump() 1.3.6.1.4.1.311.20.2.3:me@MY-COMPANY.COM @@ -96,6 +98,8 @@ LiteralValue::dump() DNS:ca.my-company.com LiteralValue::dump() +DNS:127-55-2-80ca.my-company.com +LiteralValue::dump() email:me@my-company.com LiteralValue::dump() 1.3.6.1.4.1.311.20.2.3:me@MY-COMPANY.COM Added: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest6.err URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest6.err?rev=2634&view=auto ============================================================================== --- limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest6.err (added) +++ limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest6.err Mon Nov 9 14:29:54 2009 @@ -0,0 +1,2 @@ +ERROR ca-mgm - Wrong LiteralValue for type 'DNS': 127-55-2-80 ca.my-company.com +LiteralValues.cpp: 82 ValueException: Wrong LiteralValue for type 'DNS': 127-55-2-80 ca.my-company.com Added: limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest6.out URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest6.out?rev=2634&view=auto ============================================================================== --- limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest6.out (added) +++ limal-branches/SLE-11-SP-Working-Branch/limal-ca-mgm/testsuite/single.out/CertificateTest6.out Mon Nov 9 14:29:54 2009 @@ -0,0 +1,9 @@ +START +DN Key countryName +DN Key stateOrProvinceName +DN Key localityName +DN Key organizationName +DN Key organizationalUnitName +DN Key commonName +DN Key emailAddress +RETURN Request -- To unsubscribe, e-mail: limal-commit+unsubscribe@opensuse.org For additional commands, e-mail: limal-commit+help@opensuse.org