From 7698a065526b2ce68cf626177b28cbedb276b60d Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@memberwebs.com>
Date: Sat, 28 Nov 2009 18:06:47 +0000
Subject: Use the OpenSession function for algorithm Negotiation.

This has several benefits:

 * Removes gray area of whether a single session could renegotiate
   a different key exchange.
 * Removes strange state that a session is in before negotiation of
   an algorithm.
 * Less API.
 * OpenSession() could be called multiple times for algorithms that
   require more than one back and forth negotiation. We have none of
   these presently.
---
 secret-service/org.freedesktop.Secrets.xml | 31 ++++++++++--------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'secret-service/org.freedesktop.Secrets.xml')

diff --git a/secret-service/org.freedesktop.Secrets.xml b/secret-service/org.freedesktop.Secrets.xml
index c514438..430a81e 100644
--- a/secret-service/org.freedesktop.Secrets.xml
+++ b/secret-service/org.freedesktop.Secrets.xml
@@ -102,8 +102,17 @@
 
             <method name="OpenSession">
                 <tp:docstring>Open a unique session for the caller application.</tp:docstring>
+                <arg name="algorithm" type="s" direction="in">
+                    <tp:docstring>The algorithm the caller wishes to use.</tp:docstring>
+                </arg>
+                <arg name="input" type="v" direction="in">
+                    <tp:docstring>Input arguments for the algorithm.</tp:docstring>
+                </arg>
+                <arg name="output" type="v" direction="out">
+                    <tp:docstring>Output of the session algorithm negotiation.</tp:docstring>
+                </arg>
                 <arg name="result" type="o" direction="out">
-                    <tp:docstring>The object path of the session.</tp:docstring>
+                    <tp:docstring>The object path of the session, if session was created.</tp:docstring>
                 </arg>
             </method>
 
@@ -370,26 +379,6 @@
                 <tp:docstring>Close this session.</tp:docstring>
             </method>
 
-            <method name="Negotiate">
-                <tp:docstring>Negotiate key agreement and encryption.</tp:docstring>
-
-                <arg name="algorithm" type="s" direction="in">
-                    <tp:docstring>The algorithm the caller wishes to use.</tp:docstring>
-                </arg>
-
-                <arg name="input" type="v" direction="in">
-                    <tp:docstring>Input arguments for the algorithm.</tp:docstring>
-                </arg>
-
-                <arg name="output" type="v" direction="out">
-                    <tp:docstring>Output of the negotiation.</tp:docstring>
-                </arg>
-
-                <arg name="complete" type="b" direction="out">
-                    <tp:docstring>Whether the negotiation is complete or requires further calls.</tp:docstring>
-                </arg>
-            </method>
-
         </interface>
 
     </node>
-- 
cgit v1.2.3-54-g00ecf