diff options
| author | Werner Koch <[email protected]> | 2019-05-09 12:49:59 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-05-09 12:50:41 +0000 |
| commit | 7098e4ce198d70361fb160fabeced7453c76e6b2 (patch) | |
| tree | 14af3c4faf03a69ae58086de5326444ca09d2199 | |
| parent | agent: If a Label is make sure that label is part of the prompt. (diff) | |
| download | gnupg-7098e4ce198d70361fb160fabeced7453c76e6b2.tar.gz gnupg-7098e4ce198d70361fb160fabeced7453c76e6b2.zip | |
dirmngr: Add a CSRF expection for pm.me
--
Also comment typo fix.
| -rw-r--r-- | agent/command.c | 4 | ||||
| -rw-r--r-- | dirmngr/http.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/agent/command.c b/agent/command.c index 9bb6fa306..6efd1bff2 100644 --- a/agent/command.c +++ b/agent/command.c @@ -1258,8 +1258,8 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx, } -/* Entry int for the command KEYINFO. This function handles the - command option processing. For details see hlp_keyinfo above. */ +/* Entry into the command KEYINFO. This function handles the + * command option processing. For details see hlp_keyinfo above. */ static gpg_error_t cmd_keyinfo (assuan_context_t ctx, char *line) { diff --git a/dirmngr/http.c b/dirmngr/http.c index d6856fe05..32c0fb181 100644 --- a/dirmngr/http.c +++ b/dirmngr/http.c @@ -3536,7 +3536,8 @@ same_host_p (parsed_uri_t a, parsed_uri_t b) { "protonmail.com", "api.protonmail.com" }, { NULL, "api.protonmail.ch" }, { "protonmail.ch", "api.protonmail.com" }, - { NULL, "api.protonmail.ch" } + { NULL, "api.protonmail.ch" }, + { "pm.me", "api.protonmail.ch" } }; int i; const char *from; |