* [gentoo-commits] gentoo-x86 commit in app-crypt/gcr/files: gcr-3.4.1-invalid-whitespace.patch
@ 2012-09-10 6:15 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-09-10 6:15 UTC (permalink / raw
To: gentoo-commits
tetromino 12/09/10 06:15:03
Added: gcr-3.4.1-invalid-whitespace.patch
Log:
Fix whitespace removal in secret exchange, bug #434422, thanks to Hans de Graaff.
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
Revision Changes Path
1.1 app-crypt/gcr/files/gcr-3.4.1-invalid-whitespace.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gcr/files/gcr-3.4.1-invalid-whitespace.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gcr/files/gcr-3.4.1-invalid-whitespace.patch?rev=1.1&content-type=text/plain
Index: gcr-3.4.1-invalid-whitespace.patch
===================================================================
From b7e899d45a49085e2cedbff1cf76e6d8450b0bea Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Sat, 30 Jun 2012 13:10:31 +0200
Subject: [PATCH] gcr: Fix invalid warning when sending a secret exchange
* We checked the prefix of the sent data, but didn't correctly
remove whitespace. In addition the check was inverted
* Exposed by recent changes to glib, which changed the whitespace
in the format a GKeyFile slightly
---
gcr/gcr-secret-exchange.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gcr/gcr-secret-exchange.c b/gcr/gcr-secret-exchange.c
index cb3941f..f6eb32e 100644
--- a/gcr/gcr-secret-exchange.c
+++ b/gcr/gcr-secret-exchange.c
@@ -292,9 +292,9 @@ gcr_secret_exchange_begin (GcrSecretExchange *self)
result = g_key_file_to_data (output, NULL, NULL);
g_return_val_if_fail (result != NULL, NULL);
- g_strchomp (result);
+ g_strchug (result);
- if (g_str_has_prefix (result, SECRET_EXCHANGE_PROTOCOL_1_PREFIX))
+ if (!g_str_has_prefix (result, SECRET_EXCHANGE_PROTOCOL_1_PREFIX))
g_warning ("the prepared data does not have the correct protocol prefix");
g_key_file_free (output);
@@ -540,10 +540,10 @@ gcr_secret_exchange_send (GcrSecretExchange *self,
result = g_key_file_to_data (output, NULL, NULL);
g_return_val_if_fail (result != NULL, NULL);
- g_strchomp (result);
+ g_strchug (result);
- if (g_str_has_prefix (result, SECRET_EXCHANGE_PROTOCOL_1_PREFIX))
- g_warning ("the prepared data does not have the correct protocol prefix");
+ if (!g_str_has_prefix (result, SECRET_EXCHANGE_PROTOCOL_1_PREFIX))
+ g_warning ("the prepared data does not have the correct protocol prefix: %s", result);
g_key_file_free (output);
return result;
--
1.7.12
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-crypt/gcr/files: gcr-3.4.1-invalid-whitespace.patch
@ 2014-04-23 20:40 Pacho Ramos (pacho)
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos (pacho) @ 2014-04-23 20:40 UTC (permalink / raw
To: gentoo-commits
pacho 14/04/23 20:40:29
Removed: gcr-3.4.1-invalid-whitespace.patch
Log:
Drop old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-04-23 20:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-10 6:15 [gentoo-commits] gentoo-x86 commit in app-crypt/gcr/files: gcr-3.4.1-invalid-whitespace.patch Alexandre Rostovtsev (tetromino)
-- strict thread matches above, loose matches on Subject: below --
2014-04-23 20:40 Pacho Ramos (pacho)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox