diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/gpgme.texi | 2 | ||||
| -rw-r--r-- | doc/uiserver.texi | 11 |
3 files changed, 15 insertions, 3 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 5772e682..34f30bd0 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2009-07-21 Werner Koch <[email protected]> + + * uiserver.texi (UI Server Encrypt): Add --expect-sign option to + PREP_ENCRYPT. + 2009-06-16 Marcus Brinkmann <[email protected]> * gpgme.texi (Result Management): New section. diff --git a/doc/gpgme.texi b/doc/gpgme.texi index a0bc20e8..3b1c10fa 100644 --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -4777,7 +4777,7 @@ of a @code{gpgme_op_sign} operation. The pointer is only valid if the last operation on the context was a @code{gpgme_op_sign}, @code{gpgme_op_sign_start}, @code{gpgme_op_encrypt_sign} or @code{gpgme_op_encrypt_sign_start} operation. If that operation -failed, the function might return a @code{NULL} pointer, The returned +failed, the function might return a @code{NULL} pointer. The returned pointer is only valid until the next operation is started on the context. @end deftypefun diff --git a/doc/uiserver.texi b/doc/uiserver.texi index 7c0a1e9a..c6da5ad4 100644 --- a/doc/uiserver.texi +++ b/doc/uiserver.texi @@ -118,7 +118,7 @@ Use the CMS (PKCS#7) protocol (RFC-3852). To support automagically selection of the protocol depending on the selected keys, the server MAY implement the command: -@deffn Command PREP_ENCRYPT [-@w{}-protocol=@var{name}] +@deffn Command PREP_ENCRYPT [-@w{}-protocol=@var{name}] [-@w{}-expect-sign] This commands considers all recipients set so far and decides whether it is able to take input and start the actual decryption. This is kind of @@ -129,8 +129,15 @@ command is send. The @option{--protocol} option is optional; if it is not given, the server should allow the user to select the protocol to be used based on the recipients given or by any other means. +If @option{--expect-sign} is given the server should expect that the +message will also be signed and use this hint to present a unified +recipient and signer selection dialog if possible and desired. A +selected signer should then be cached for the expected SIGN command +(which is expected in the same session but possible on another +connection). + If this command is given again before a successful @command{ENCRYPT} -command, the second one takes effect. +command, the second one takes effect. Before sending the OK response the server shall tell the client the protocol to be used (either the one given by the argument or the one |