From 8da497e0bb243261737b8c90426fb99f916c4ccc Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 06:33:53 +0000 Subject: import libsecret-0.18.6-1.el7 --- diff --git a/.gitignore b/.gitignore index 995ee56..f32a6d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libsecret-0.18.5.tar.xz +SOURCES/libsecret-0.18.6.tar.xz diff --git a/.libsecret.metadata b/.libsecret.metadata index b7f71b6..00c5183 100644 --- a/.libsecret.metadata +++ b/.libsecret.metadata @@ -1 +1 @@ -65d80307756ef45f7c282098c48125ef41f56acd SOURCES/libsecret-0.18.5.tar.xz +e840a40062c135f4eec41f057a326d9ed519ff4f SOURCES/libsecret-0.18.6.tar.xz diff --git a/SOURCES/libsecret-0.18.5-fix-invalid-secret-transfer-error.patch b/SOURCES/libsecret-0.18.5-fix-invalid-secret-transfer-error.patch deleted file mode 100644 index b15d334..0000000 --- a/SOURCES/libsecret-0.18.5-fix-invalid-secret-transfer-error.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 998065599c66055dcffa1ef1ddebb947ccd68248 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tomasz=20Mi=C4=85sko?= -Date: Thu, 9 Feb 2017 09:45:01 +0100 -Subject: DH: Ensure that generated secret occupies the same number of bytes as - prime. - -https://bugzilla.gnome.org/show_bug.cgi?id=778357 ---- - egg/egg-dh.c | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/egg/egg-dh.c b/egg/egg-dh.c -index e869c99..b190488 100644 ---- a/egg/egg-dh.c -+++ b/egg/egg-dh.c -@@ -314,6 +314,7 @@ egg_dh_gen_secret (gcry_mpi_t peer, gcry_mpi_t priv, - { - gcry_error_t gcry; - guchar *value; -+ gsize n_prime; - gsize n_value; - gcry_mpi_t k; - gint bits; -@@ -330,19 +331,25 @@ egg_dh_gen_secret (gcry_mpi_t peer, gcry_mpi_t priv, - gcry_mpi_powm (k, peer, priv, prime); - - /* Write out the secret */ -- gcry = gcry_mpi_print (GCRYMPI_FMT_USG, NULL, 0, &n_value, k); -+ gcry = gcry_mpi_print (GCRYMPI_FMT_USG, NULL, 0, &n_prime, prime); - g_return_val_if_fail (gcry == 0, NULL); -- value = egg_secure_alloc (n_value); -- gcry = gcry_mpi_print (GCRYMPI_FMT_USG, value, n_value, &n_value, k); -+ value = egg_secure_alloc (n_prime); -+ gcry = gcry_mpi_print (GCRYMPI_FMT_USG, value, n_prime, &n_value, k); - g_return_val_if_fail (gcry == 0, NULL); - -+ /* Pad the secret with zero bytes to match length of prime in bytes. */ -+ if (n_value < n_prime) { -+ memmove (value + (n_prime - n_value), value, n_value); -+ memset (value, 0, (n_prime - n_value)); -+ } -+ - #if DEBUG_DH_SECRET - g_printerr ("DH SECRET: "); - gcry_mpi_dump (k); - #endif - gcry_mpi_release (k); - -- *bytes = n_value; -+ *bytes = n_prime; - - #if DEBUG_DH_SECRET - gcry_mpi_scan (&k, GCRYMPI_FMT_USG, value, bytes, NULL); --- -cgit v0.12 - diff --git a/SPECS/libsecret.spec b/SPECS/libsecret.spec index f3d925e..5edb8a1 100644 --- a/SPECS/libsecret.spec +++ b/SPECS/libsecret.spec @@ -6,21 +6,18 @@ %endif Name: libsecret -Version: 0.18.5 -Release: 2%{?dist} +Version: 0.18.6 +Release: 1%{?dist} Summary: Library for storing and retrieving passwords and other secrets License: LGPLv2+ URL: https://wiki.gnome.org/Projects/Libsecret Source0: http://download.gnome.org/sources/libsecret/%{release_version}/libsecret-%{version}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=1434474 -Patch0: libsecret-0.18.5-fix-invalid-secret-transfer-error.patch BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: libgcrypt-devel >= 1.2.2 -BuildRequires: vala-devel >= 0.17.2.12 BuildRequires: vala BuildRequires: gtk-doc BuildRequires: libxslt-devel @@ -48,7 +45,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 # Use system valgrind headers instead %if 0%{?has_valgrind} @@ -94,6 +90,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Thu Mar 29 2018 Kalev Lember - 0.18.6-1 +- Update to 0.18.6 +- Resolves: #1570013 + * Tue Mar 21 2017 David King - 0.18.5-2 - Fix invalid secret transfer error (#1434474)