security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

wks: Add hack for the broken posteo system

Browse Source 
* tools/gpg-wks-client.c (command_send): Additional hack for posteo.
Check the protocol-version flag.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-09-12 18:08:09 +02:00
parent 332c9eaa2a
commit a821b4f556
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/gpg-wks-client.c
View File

@ -693,6 +693,7 @@ command_send (const char *fingerprint, char *userid)
mime_maker_t mime = NULL; mime_maker_t mime = NULL;
struct policy_flags_s policy; struct policy_flags_s policy;
int no_encrypt = 0; int no_encrypt = 0;
int posteo_hack = 0;
const char *domain; const char *domain;
memset (&policy, 0, sizeof policy); memset (&policy, 0, sizeof policy);
@ -762,11 +763,14 @@ command_send (const char *fingerprint, char *userid)
if (policy.auth_submit) if (policy.auth_submit)
log_info ("no confirmation required for '%s'\n", addrspec); log_info ("no confirmation required for '%s'\n", addrspec);
/* Hack to support old providers. */ /* Hack to support posteo but let them disable this by setting the
if (policy.auth_submit && !ascii_strcasecmp (domain, "posteo.de")) * new policy-version flag. */
if (policy.protocol_version < 3
&& !ascii_strcasecmp (domain, "posteo.de"))
{ {
log_info ("Warning: Using draft-1 method for domain '%s'\n", domain); log_info ("Warning: Using draft-1 method for domain '%s'\n", domain);
no_encrypt = 1; no_encrypt = 1;
posteo_hack = 1;
} }
/* Encrypt the key part. */ /* Encrypt the key part. */
@ -805,6 +809,18 @@ command_send (const char *fingerprint, char *userid)
void *data; void *data;
size_t datalen, n; size_t datalen, n;
if (posteo_hack)
{
/* Needs a multipart/mixed with one(!) attachment. It does
* not grok a non-multipart mail. */
err = mime_maker_add_header (mime, "Content-Type", "multipart/mixed");
if (err)
goto leave;
err = mime_maker_add_container (mime);
if (err)
goto leave;
}
err = mime_maker_add_header (mime, "Content-type", err = mime_maker_add_header (mime, "Content-type",
"application/pgp-keys"); "application/pgp-keys");
if (err) if (err)