From 4e1f04a4cd30859507218395e630e886801ae2b7 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 6 Mar 2019 12:40:45 +0100
Subject: [PATCH] card: Allow PEM encoded certificates in "writecert".

* tools/gpg-card.c (cmd_writecert): Convert from base64.

Signed-off-by: Werner Koch <wk@gnupg.org>
---
 tools/gpg-card.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index c9b8380cd..e2d728dab 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -1647,6 +1647,20 @@ cmd_writecert (card_info_t info, char *argstr)
       err = get_data_from_file (argstr, &data, &datalen);
       if (err)
         goto leave;
+      if (ascii_memistr (data, datalen, "-----BEGIN CERTIFICATE-----")
+          && ascii_memistr (data, datalen, "-----END CERTIFICATE-----")
+          && !memchr (data, 0, datalen) && !memchr (data, 1, datalen))
+        {
+          struct b64state b64;
+
+          err = b64dec_start (&b64, "");
+          if (!err)
+            err = b64dec_proc (&b64, data, datalen, &datalen);
+          if (!err)
+            err = b64dec_finish (&b64);
+          if (err)
+            goto leave;
+        }
     }
   else
     {