Accepting request 751603 from home:jirislaby:branches:network

- Version bump to 0.11:
  * mobile key authentication
  * manual pages are generated
  * compatibility with OpenSSL 1.1.0
- drop %check as it does nothing (and breaks build ATM)

OBS-URL: https://build.opensuse.org/request/show/751603
OBS-URL: https://build.opensuse.org/package/show/network/libisds?expand=0&rev=24
This commit is contained in:
Tomáš Chvátal 2019-11-29 09:48:29 +00:00 committed by Git OBS Bridge
parent a62ab6c765
commit dafd84b2aa
7 changed files with 27 additions and 58 deletions

View File

@ -1,41 +0,0 @@
From: =?utf8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz>
Date: Wed, 24 Apr 2019 04:32:09 +0200
Subject: [PATCH] Test: Accept IE_NETWORK error when client does not provide a
correct certificate
Git-commit: 5cc5b83788e229582bd048a630b3151a140f9437
Patch-mainline: yes
After upgrading GnuTLS to 3.6.4,
test/simline/certificate_user_password_authentication tests that exhibit
a missing client's certificate and a bad client's certificate started to
fail. That's because cURL returns a network error instead of a TLS error in
that case when TLSv1.3 is used.
This patch work arounds this cURL deficiency.
See a similar GnuTLS bug report
<https://gitlab.com/gnutls/gnutls/issues/615>.
---
test/simline/certificate_user_password_authentication.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/test/simline/certificate_user_password_authentication.c b/test/simline/certificate_user_password_authentication.c
index c0192ab..7789d7c 100644
--- a/test/simline/certificate_user_password_authentication.c
+++ b/test/simline/certificate_user_password_authentication.c
@@ -35,7 +35,11 @@ static int test_login(const isds_error error, struct isds_ctx *context,
isds_error err;
err = isds_login(context, url, username, password, pki_credentials, otp);
- if (error != err)
+ /* If TLSv1.3 is used, cURL reports a network error instead of a security
+ * error if server refuses client's certificate (since GnuTLS 3.6.4).
+ * Maybe a <https://gitlab.com/gnutls/gnutls/issues/615>. As a workaround,
+ * accept IE_NETWORK if IE_SECURITY was expected. */
+ if (error != err && (IE_SECURITY != error || IE_NETWORK != err))
FAIL_TEST("Wrong return code: expected=%s, returned=%s (%s)",
isds_strerror(error), isds_strerror(err),
isds_long_message(context));
--
2.10.5.GIT

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7861c63700ce9c1206132475b57eed75598681f80b9a5a49015467ccd48966ab
size 726040

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iHUEABEIAB0WIQRLUoOT5qOw37LvOmQSycXHZ8b6ogUCWyk/fAAKCRASycXHZ8b6
optNAP4/ntADdBaOYDu4K4gDbY7N3Ouv6Aq9U7uoX+E54WagAwD+O+/65kmHKANH
IZIwZAx7R70mDxHn23bJIomZJA6Hj9A=
=j474
-----END PGP SIGNATURE-----

3
libisds-0.11.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79b956ac8b17fed4b5b8d791c6eb614b80b7afdc69dd2ea2ec45d07c6830c1b3
size 741952

7
libisds-0.11.tar.xz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
iHUEABEIAB0WIQRLUoOT5qOw37LvOmQSycXHZ8b6ogUCXXE/tgAKCRASycXHZ8b6
oi+yAP4tK4x3riLuwPgS3RPDcWQS4pfOAlMfrU4kRkwQcy9WjQD/Zdrn7leUmmhV
M1qsLtaoA7EWKCo4+/ts+Bih6/gJ614=
=+hxh
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Nov 28 12:37:33 UTC 2019 - Jiri Slaby <jslaby@suse.com>
- Version bump to 0.11:
* mobile key authentication
* manual pages are generated
* compatibility with OpenSSL 1.1.0
- drop %check as it does nothing (and breaks build ATM)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 2 19:25:08 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Sun Jun 2 19:25:08 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -18,7 +18,7 @@
%define libname %{name}5 %define libname %{name}5
Name: libisds Name: libisds
Version: 0.10.8 Version: 0.11
Release: 0 Release: 0
Summary: Library for accessing the Czech Data Boxes Summary: Library for accessing the Czech Data Boxes
License: LGPL-3.0-or-later License: LGPL-3.0-or-later
@ -27,11 +27,12 @@ URL: http://xpisar.wz.cz/libisds/
Source0: http://xpisar.wz.cz/%{name}/dist/%{name}-%{version}.tar.xz Source0: http://xpisar.wz.cz/%{name}/dist/%{name}-%{version}.tar.xz
Source1: http://xpisar.wz.cz/%{name}/dist/%{name}-%{version}.tar.xz.asc Source1: http://xpisar.wz.cz/%{name}/dist/%{name}-%{version}.tar.xz.asc
Source2: %{name}.keyring Source2: %{name}.keyring
Patch0: fix-gnutls-3.6.4.patch BuildRequires: docbook-xsl-stylesheets
BuildRequires: gpg2 BuildRequires: gpg2
BuildRequires: libgcrypt-devel BuildRequires: libgcrypt-devel
BuildRequires: libgpgme-devel BuildRequires: libgpgme-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xsltproc
BuildRequires: pkgconfig(expat) >= 2.0.0 BuildRequires: pkgconfig(expat) >= 2.0.0
BuildRequires: pkgconfig(gnutls) >= 2.12.0 BuildRequires: pkgconfig(gnutls) >= 2.12.0
BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libcrypto)
@ -63,27 +64,26 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}. developing applications that use %{name}.
%prep %prep
%setup -q %autosetup -p1
%autopatch -p1
%build %build
%configure \ %configure \
--disable-fatalwarnings \ --disable-fatalwarnings \
--disable-static \ --disable-static \
--enable-test \ --enable-test \
--with-docbook-xsl-stylesheets=/usr/share/xml/docbook/stylesheet/nwalsh/current/ \
--with-libcurl \ --with-libcurl \
--disable-openssl-backend --disable-openssl-backend
make %{?_smp_mflags} make %{?_smp_mflags}
%check
make check %{?_smp_mflags}
%install %install
%make_install %make_install
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name} %find_lang %{name}
mv doc specification mv doc specification
rm -rf client/.deps rm -rf client/.deps
rm -f specification/Makefile*
rm -f specification/*.3
%post -n %{libname} -p /sbin/ldconfig %post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig
@ -97,6 +97,7 @@ rm -rf client/.deps
%{_includedir}/isds.h %{_includedir}/isds.h
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%{_mandir}/man3/*.3.gz
%doc client specification %doc client specification
%changelog %changelog