forked from pool/libsecret
Accepting request 592852 from GNOME:Next
OBS-URL: https://build.opensuse.org/request/show/592852 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libsecret?expand=0&rev=36
This commit is contained in:
Git OBS Bridge
parent
dbfc2e7a99
commit
7763b62a1e
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9ce7bd8dd5831f2786c935d82638ac428fa085057cc6780aba0e39375887ccb3
|
||||
size 508556
|
||||
3
libsecret-0.18.6.tar.xz
Normal file
3
libsecret-0.18.6.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5efbc890ba41a323ffe0599cd260fd12bd8eb62a04aa1bd1b2762575d253d66f
|
||||
size 487836
|
||||
@ -1,57 +0,0 @@
|
||||
From 998065599c66055dcffa1ef1ddebb947ccd68248 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tomasz=20Mi=C4=85sko?= <tomasz.miasko@gmail.com>
|
||||
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
|
||||
|
||||
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 29 23:44:12 UTC 2018 - luc14n0@linuxmail.org
|
||||
|
||||
- Update to version 0.18.6:
|
||||
+ Fix shared key derivation between libsecret and gnome-keyring
|
||||
(bgo#778357).
|
||||
+ Avoid run-time error when gnome-keyring is not responding
|
||||
(bgo#787391).
|
||||
+ Enable cross compilation (bgo#748111).
|
||||
+ GI annotation fixes (bgo#785034).
|
||||
+ Fix textual typos (bgo#782206).
|
||||
+ Updated translations.
|
||||
- Drop libsecret-secret-size.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 10 00:23:06 UTC 2018 - jengelh@inai.de
|
||||
|
||||
|
||||
@ -18,18 +18,17 @@
|
||||
|
||||
%define have_lang 1
|
||||
Name: libsecret
|
||||
Version: 0.18.5
|
||||
Version: 0.18.6
|
||||
Release: 0
|
||||
Summary: Library for accessing the Secret Service API
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/GNOME
|
||||
Url: https://wiki.gnome.org/Projects/Libsecret
|
||||
URL: https://wiki.gnome.org/Projects/Libsecret
|
||||
Source0: http://download.gnome.org/sources/libsecret/0.18/%{name}-%{version}.tar.xz
|
||||
Source99: baselibs.conf
|
||||
# PATCH-FIX-UPSTREAM libsecret-secret-size.patch bgo#778357 dimstar@opensuse.org -- Ensure that generated secret occupies the same number of bytes as prime.
|
||||
Patch0: libsecret-secret-size.patch
|
||||
## SLE-only patches start at 1000
|
||||
# PATCH-FIX-SLE libsecret-bsc932232-use-libgcrypt-allocators.patch bsc#932232 hpj@suse.com -- use libgcrypt allocators for FIPS mode
|
||||
Patch1: libsecret-bsc932232-use-libgcrypt-allocators.patch
|
||||
Patch1000: libsecret-bsc932232-use-libgcrypt-allocators.patch
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gobject-introspection-devel >= 1.29
|
||||
@ -94,9 +93,8 @@ secrets. It communicates with the "Secret Service" using DBus.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%if !0%{?is_opensuse}
|
||||
%patch1 -p1
|
||||
%patch1000 -p1
|
||||
%endif
|
||||
translation-update-upstream
|
||||
|
||||
@ -118,7 +116,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%files -n libsecret-1-0
|
||||
%license COPYING
|
||||
%doc AUTHORS ChangeLog NEWS README
|
||||
%doc NEWS README
|
||||
%{_libdir}/libsecret-1.so.*
|
||||
|
||||
%files -n typelib-1_0-Secret-1
|
||||
@ -129,6 +127,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%{_mandir}/man1/secret-tool.1%{?ext_man}
|
||||
|
||||
%files devel
|
||||
%doc AUTHORS ChangeLog
|
||||
%{_libdir}/libsecret-1.so
|
||||
%{_libdir}/pkgconfig/libsecret-1.pc
|
||||
%{_libdir}/pkgconfig/libsecret-unstable.pc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user