From: Stef Walter <stefw@collabora.co.uk>
Date: Sat, 1 Oct 2011 11:07:38 +0000 (+0200)
Subject: ui: Use GcrSecretExchange for passing passwords to/from prompt
X-Git-Tag: split~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e3a5058766025d8e68e264636cc002d9cd3d54e;p=platform%2Fupstream%2Fgcr.git

ui: Use GcrSecretExchange for passing passwords to/from prompt

 * And integrate this with our credential stuff inside of the
   dbus secret service prompts
 * Fix a bug in GcrSecretService if key already derived, and data
   is received.
---

diff --git a/egg/Makefile.am b/egg/Makefile.am
index d01028a..0b635d0 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -15,7 +15,7 @@ BUILT_SOURCES = \
 	asn1-def-pk.c asn1-def-pkix.c
 
 INCLUDES = \
-	-I$(top_srcdir)
+	-I$(top_srcdir) \
 	-I$(top_builddir)
 
 libegg_la_CFLAGS = \
diff --git a/gcr/gcr-secret-exchange.c b/gcr/gcr-secret-exchange.c
index 6f6d5c6..5f99def 100644
--- a/gcr/gcr-secret-exchange.c
+++ b/gcr/gcr-secret-exchange.c
@@ -296,8 +296,8 @@ gcr_secret_exchange_begin (GcrSecretExchange *self)
 }
 
 static gboolean
-calculate_key (GcrSecretExchange *self,
-               GKeyFile *input)
+derive_key (GcrSecretExchange *self,
+            GKeyFile *input)
 {
 	GcrSecretExchangeClass *klass;
 	gboolean ret;
@@ -408,8 +408,10 @@ gcr_secret_exchange_receive (GcrSecretExchange *self,
 		self->pv->generated = TRUE;
 	}
 
-	if (!calculate_key (self, input))
-		return FALSE;
+	if (!self->pv->derived) {
+		if (!derive_key (self, input))
+			return FALSE;
+	}
 
 	ret = TRUE;