Hello community,
here is the log from the commit of package limal-ca-mgm
checked in at Tue Jul 8 22:09:57 CEST 2008.
--------
--- limal-ca-mgm/limal-ca-mgm.changes 2008-06-06 10:28:00.000000000 +0200
+++ limal-ca-mgm/limal-ca-mgm.changes 2008-07-01 16:11:41.454885000 +0200
@@ -1,0 +2,6 @@
+Tue Jul 1 12:04:45 CEST 2008 - mc@suse.de
+
+- version 1.5.0
+- support IPv6 addresses in LiteralValue IP
+
+-------------------------------------------------------------------
Old:
----
limal-ca-mgm-1.4.10.tar.bz2
New:
----
limal-ca-mgm-1.5.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ limal-ca-mgm.spec ++++++
--- /var/tmp/diff_new_pack.Q22479/_old 2008-07-08 22:09:38.000000000 +0200
+++ /var/tmp/diff_new_pack.Q22479/_new 2008-07-08 22:09:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package limal-ca-mgm (Version 1.4.10)
+# spec file for package limal-ca-mgm (Version 1.5.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: limal-ca-mgm
-Version: 1.4.10
+Version: 1.5.0
Release: 1
License: GPL v2 or later
Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: limal-ca-mgm-1.4.10.tar.bz2
+Source0: limal-ca-mgm-1.5.0.tar.bz2
Prefix: /usr
%define swiglibdir /usr/share/limal/typemaps
BuildRequires: curl gcc-c++ limal-devel limal-devtools limal-perl perl-gettext sgml-skel
@@ -92,7 +92,7 @@
Michael Calmer
%prep
-%setup -n limal-ca-mgm-1.4.10
+%setup -n limal-ca-mgm-1.5.0
%build
%{prefix}/bin/limaltool limalautoconf
@@ -155,6 +155,9 @@
%{perl_vendorarch}/auto/LIMAL/CaMgm/*
%{perl_vendorarch}/LIMAL/*.pm
%changelog
+* Tue Jul 01 2008 mc@suse.de
+- version 1.5.0
+- support IPv6 addresses in LiteralValue IP
* Fri Jun 06 2008 mc@suse.de
- version 1.4.10
- update 18n files
++++++ limal-ca-mgm-1.4.10.tar.bz2 -> limal-ca-mgm-1.5.0.tar.bz2 ++++++
++++ 4551 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/configure.in new/limal-ca-mgm-1.5.0/configure.in
--- old/limal-ca-mgm-1.4.10/configure.in 2008-06-06 10:25:24.000000000 +0200
+++ new/limal-ca-mgm-1.5.0/configure.in 2008-07-01 16:02:19.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by limalautoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(limal-ca-mgm, 1.4.10, http://www.suse.de/feedback, limal-ca-mgm)
+AC_INIT(limal-ca-mgm, 1.5.0, http://www.suse.de/feedback, limal-ca-mgm)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important LiMaL variables
-VERSION="1.4.10"
+VERSION="1.5.0"
RPMNAME="limal-ca-mgm"
RPMARCH=""
RPMLIB="ca-mgm"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/src/limal/ca-mgm/config.h new/limal-ca-mgm-1.5.0/src/limal/ca-mgm/config.h
--- old/limal-ca-mgm-1.4.10/src/limal/ca-mgm/config.h 2008-02-13 14:36:23.000000000 +0100
+++ new/limal-ca-mgm-1.5.0/src/limal/ca-mgm/config.h 2008-07-01 16:09:22.000000000 +0200
@@ -76,7 +76,7 @@
* LiMaL ca-mgm library version.
*/
#ifndef LIMAL_CA_MGM_LIB_VERSION
-#define LIMAL_CA_MGM_LIB_VERSION "1.4.5"
+#define LIMAL_CA_MGM_LIB_VERSION "1.5.0"
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/src/LiteralValues.cpp new/limal-ca-mgm-1.5.0/src/LiteralValues.cpp
--- old/limal-ca-mgm-1.4.10/src/LiteralValues.cpp 2007-10-17 12:50:36.000000000 +0200
+++ new/limal-ca-mgm-1.5.0/src/LiteralValues.cpp 2008-07-01 11:06:48.000000000 +0200
@@ -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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/src/LiteralValues_Priv.cpp new/limal-ca-mgm-1.5.0/src/LiteralValues_Priv.cpp
--- old/limal-ca-mgm-1.4.10/src/LiteralValues_Priv.cpp 2007-10-17 12:52:43.000000000 +0200
+++ new/limal-ca-mgm-1.5.0/src/LiteralValues_Priv.cpp 2008-07-01 11:55:13.000000000 +0200
@@ -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:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/src/Utils.hpp new/limal-ca-mgm-1.5.0/src/Utils.hpp
--- old/limal-ca-mgm-1.4.10/src/Utils.hpp 2007-10-17 13:40:03.000000000 +0200
+++ new/limal-ca-mgm-1.5.0/src/Utils.hpp 2008-07-01 15:10:20.000000000 +0200
@@ -145,13 +145,31 @@
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]{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;
+}
+
inline limal::ValueCheck initAccessOIDCheck() {
limal::ValueCheck checkAccessOID =
limal::ValueCheck(new limal::ValuePosixRECheck("^(OCSP|caIssuers)$"))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/testsuite/CertificateTest3.cc new/limal-ca-mgm-1.5.0/testsuite/CertificateTest3.cc
--- old/limal-ca-mgm-1.4.10/testsuite/CertificateTest3.cc 2007-08-06 09:56:39.000000000 +0200
+++ new/limal-ca-mgm-1.5.0/testsuite/CertificateTest3.cc 2008-07-01 11:33:20.000000000 +0200
@@ -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@my-company.com"));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/testsuite/CertificateTest5.cc new/limal-ca-mgm-1.5.0/testsuite/CertificateTest5.cc
--- old/limal-ca-mgm-1.4.10/testsuite/CertificateTest5.cc 2007-09-28 16:03:10.000000000 +0200
+++ new/limal-ca-mgm-1.5.0/testsuite/CertificateTest5.cc 2008-07-01 11:42:46.000000000 +0200
@@ -98,6 +98,7 @@
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);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/testsuite/IPv6CheckTest.cc new/limal-ca-mgm-1.5.0/testsuite/IPv6CheckTest.cc
--- old/limal-ca-mgm-1.4.10/testsuite/IPv6CheckTest.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/limal-ca-mgm-1.5.0/testsuite/IPv6CheckTest.cc 2008-07-01 15:11:45.000000000 +0200
@@ -0,0 +1,82 @@
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "Utils.hpp"
+
+#include <iostream>
+#include <fstream>
+#include
+
+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: */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/testsuite/Makefile.am new/limal-ca-mgm-1.5.0/testsuite/Makefile.am
--- old/limal-ca-mgm-1.4.10/testsuite/Makefile.am 2007-09-28 17:01:38.000000000 +0200
+++ new/limal-ca-mgm-1.5.0/testsuite/Makefile.am 2008-07-01 14:31:46.000000000 +0200
@@ -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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/testsuite/single.out/CertificateTest5.out new/limal-ca-mgm-1.5.0/testsuite/single.out/CertificateTest5.out
--- old/limal-ca-mgm-1.4.10/testsuite/single.out/CertificateTest5.out 2007-09-28 16:03:49.000000000 +0200
+++ new/limal-ca-mgm-1.5.0/testsuite/single.out/CertificateTest5.out 2008-07-01 11:56:54.000000000 +0200
@@ -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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/testsuite/single.out/IPv6CheckTest.out new/limal-ca-mgm-1.5.0/testsuite/single.out/IPv6CheckTest.out
--- old/limal-ca-mgm-1.4.10/testsuite/single.out/IPv6CheckTest.out 1970-01-01 01:00:00.000000000 +0100
+++ new/limal-ca-mgm-1.5.0/testsuite/single.out/IPv6CheckTest.out 2008-07-01 15:15:17.000000000 +0200
@@ -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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-ca-mgm-1.4.10/VERSION new/limal-ca-mgm-1.5.0/VERSION
--- old/limal-ca-mgm-1.4.10/VERSION 2008-06-06 10:25:05.000000000 +0200
+++ new/limal-ca-mgm-1.5.0/VERSION 2008-07-01 12:04:30.000000000 +0200
@@ -1 +1 @@
-1.4.10
+1.5.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org