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 (file)
--- 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 (file)
--- 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;