diff options
| author | Werner Koch <[email protected]> | 2017-02-23 19:10:59 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-02-23 19:10:59 +0000 |
| commit | d30e17ac62dea8913b7f353971d546b6b1a09bd5 (patch) | |
| tree | dc02a3538c98f3ae5ce32f7147800d2d9a386937 /tools/gpg-wks.h | |
| parent | wks: New callback for the mime parser. (diff) | |
| download | gnupg-d30e17ac62dea8913b7f353971d546b6b1a09bd5.tar.gz gnupg-d30e17ac62dea8913b7f353971d546b6b1a09bd5.zip | |
wks: Make sure that the draft 2 request is correctly detected.
* tools/gpg-wks.h (WKS_DRAFT_VERSION): New.
* tools/wks-receive.c (new_part): Move test wks draft version to ...
(t2body): new callback.
(wks_receive): Register this callback.
* tools/gpg-wks-server.c (send_confirmation_request): Emit draft
version header.
(send_congratulation_message): Ditto.
* tools/gpg-wks-client.c (decrypt_stream_parm_s): New.
(decrypt_stream_status_cb): Check DECRYTPION_KEY status.
(decrypt_stream): Get infor from new callback.
(process_confirmation_request): New arg 'mainfpr'. Check that it
matches the decryption key.
(read_confirmation_request): Check that the decryption key has been
generated by us.
(command_send): Use macro from draft version header.
(send_confirmation_response): Emit draft version header.
--
This patch also adds a check to only send a confirmation when the
decryption has been done by an ultimately trusted (self-generated)
key.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'tools/gpg-wks.h')
| -rw-r--r-- | tools/gpg-wks.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/gpg-wks.h b/tools/gpg-wks.h index 62ceb34f9..3b28af4d6 100644 --- a/tools/gpg-wks.h +++ b/tools/gpg-wks.h @@ -24,6 +24,10 @@ #include "../common/strlist.h" #include "mime-maker.h" +/* The draft version we implement. */ +#define WKS_DRAFT_VERSION 3 + + /* We keep all global options in the structure OPT. */ struct { |