From: Werner Koch <wk@gnupg.org>
Date: Thu, 9 May 2019 12:49:59 +0000 (+0200)
Subject: dirmngr: Add a CSRF expection for pm.me
X-Git-Tag: archive/raspbian/2.2.12-1+rpi1+deb10u2^2~43
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ac0989482d7ada9c0f163dad5ff71857c90c3095;p=gnupg2.git

dirmngr: Add a CSRF expection for pm.me

--

Also comment typo fix.

(cherry picked from commit 7c4029110ab45d02e746ddcc13a87952ca0099f5)

Gbp-Pq: Topic from-2.2.16
Gbp-Pq: Name dirmngr-Add-a-CSRF-expection-for-pm.me.patch
---

diff --git a/agent/command.c b/agent/command.c
index 41fb394..cf8a2e4 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1231,8 +1231,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 7fdd06a..384f256 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -3530,7 +3530,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;