Package init

This commit is contained in:
overweight 2019-09-30 11:20:15 -04:00
commit 87a2c943fd
3 changed files with 142 additions and 0 deletions

View File

@ -0,0 +1,55 @@
Please see this bug report for full details:
https://github.com/lsh123/xmlsec/issues/164
commit e303e077fb3e13654ba711b2816ff1a94247338b
Author: lsh123 <aleksey@aleksey.com>
Date: Wed Apr 11 17:13:43 2018 -1000
Add missing return(-1). (#165)
Fixed issue #164. All other crypto libraries are ok.
diff --git a/src/openssl/x509.c b/src/openssl/x509.c
index 15fe70db..b98e62d1 100644
--- a/src/openssl/x509.c
+++ b/src/openssl/x509.c
@@ -870,6 +870,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI
xmlSecInternalError2("xmlSecOpenSSLX509CertificateNodeRead",
xmlSecKeyDataGetName(data),
"node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur)));
+ return(-1);
}
} else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SubjectName, xmlSecDSigNs)) {
ret = xmlSecOpenSSLX509SubjectNameNodeRead(data, cur, keyInfoCtx);
@@ -877,6 +878,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI
xmlSecInternalError2("xmlSecOpenSSLX509SubjectNameNodeRead",
xmlSecKeyDataGetName(data),
"node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur)));
+ return(-1);
}
} else if(xmlSecCheckNodeName(cur, xmlSecNodeX509IssuerSerial, xmlSecDSigNs)) {
ret = xmlSecOpenSSLX509IssuerSerialNodeRead(data, cur, keyInfoCtx);
@@ -884,6 +886,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI
xmlSecInternalError2("xmlSecOpenSSLX509IssuerSerialNodeRead",
xmlSecKeyDataGetName(data),
"node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur)));
+ return(-1);
}
} else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SKI, xmlSecDSigNs)) {
ret = xmlSecOpenSSLX509SKINodeRead(data, cur, keyInfoCtx);
@@ -891,6 +894,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI
xmlSecInternalError2("xmlSecOpenSSLX509SKINodeRead",
xmlSecKeyDataGetName(data),
"node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur)));
+ return(-1);
}
} else if(xmlSecCheckNodeName(cur, xmlSecNodeX509CRL, xmlSecDSigNs)) {
ret = xmlSecOpenSSLX509CRLNodeRead(data, cur, keyInfoCtx);
@@ -898,6 +902,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI
xmlSecInternalError2("xmlSecOpenSSLX509CRLNodeRead",
xmlSecKeyDataGetName(data),
"node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur)));
+ return(-1);
}
} else if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD) != 0) {
/* laxi schema validation: ignore unknown nodes */

BIN
xmlsec1-1.2.25.tar.gz Normal file

Binary file not shown.

87
xmlsec1.spec Normal file
View File

@ -0,0 +1,87 @@
Name: xmlsec1
Version: 1.2.25
Release: 6
Summary: A C library based on LibXML2
License: MIT
URL: http://www.aleksey.com/xmlsec
Source0: http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz
# Path1 get from fedora
Patch1: xmlSecOpenSSLX509DataNodeRead-error.patch
BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 pkgconfig(libxslt) >= 1.0.20 pkgconfig(openssl) >= 1.0.0
BuildRequires: pkgconfig(nss) >= 3.11.1 pkgconfig(nspr) >= 4.4.1 libgcrypt-devel >= 1.4.0 libtool
BuildRequires: pkgconfig(gnutls) >= 2.8.0 libtool-ltdl-devel autoconf automake gettext-devel
Provides: xmlsec1-openssl xmlsec1-gcrypt xmlsec1-gnutls xmlsec1-nss
Obsoletes: xmlsec1-openssl xmlsec1-gcrypt xmlsec1-gnutls xmlsec1-nss
%description
XMLSec library provides C based implementation for major XML Security standards. It is based on well known
LibXML, LibXSLT and OpenSSL libraries.
%package devel
Summary: Development required libraries
Requires: %{name} = %{version}-%{release} openssl-devel >= 1.0.0
Provides: xmlsec1-openssl-devel xmlsec1-gcrypt-devel xmlsec1-gnutls-devel xmlsec1-nss-devel
Obsoletes: xmlsec1-openssl-devel xmlsec1-gcrypt-devel xmlsec1-gnutls-devel xmlsec1-nss-devel
%description devel
This package contains the libraries and develop content for the xmlsec library.
%package help
Summary: Help documentation related to xmlsec library
Buildarch: noarch
%description help
This package includes help documentation and manuals related to xmlsec library.
%prep
%autosetup -p1
%build
autoreconf -vfi
%configure --disable-static
%disable_rpath
%make_build V=1
sed 's+/lib64+/$archlib+g' < xmlsec1-config | sed 's+/lib+/$archlib+g' | sed 's+ -DXMLSEC_NO_SIZE_T++' > \
xmlsec1-config.$$ && mv xmlsec1-config.$$ xmlsec1-config
%install
%make_install
rm -rf __tmp_doc
install -d __tmp_doc
mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%doc AUTHORS ChangeLog NEWS README Copyright
%{_bindir}/xmlsec1
%{_libdir}/*.so.*
%exclude %{_libdir}/*.la
%files devel
%doc HACKING __tmp_doc/*
%{_bindir}/xmlsec1-config
%{_includedir}/xmlsec1/xmlsec/*
%{_libdir}/xmlsec1Conf.sh
%{_libdir}/pkgconfig/xmlsec1*.pc
%{_libdir}/*.so
%{_datadir}/aclocal/xmlsec1.m4
%files help
%{_mandir}/man1/*.1.*
%changelog
* Thu Sep 19 2019 dongjian <dongjian13@huawei.com> - 1.2.25-6
- Package init