From 25428be52168fa9c581b7f11c95a5c63b25343b7 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 17 Oct 2016 12:02:28 +0900
Subject: [PATCH] scd: Fix keytocard for ECC.

* scd/app-openpgp.c (build_ecc_privkey_template): Size can be greater
than 128 when it comes with public key for curve of larger field.

--

Reported-by: Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 scd/app-openpgp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 563a045bd..ef335fee3 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2689,6 +2689,8 @@ build_ecc_privkey_template (app_t app, int keyno,
                    + privkey_len
                    + suffix_len
                    + datalen);
+  if (exthdr_len + privkey_len + suffix_len + datalen >= 128)
+    template_size++;
   tp = template = xtrymalloc_secure (template_size);
   if (!template)
     return gpg_error_from_syserror ();