From 86a0e72dbeebcee7aae4e66fe0e6de287ea53809 Mon Sep 17 00:00:00 2001
From: Trevor Bentley <trevor@yubico.com>
Date: Mon, 3 Jul 2017 11:15:27 +0200
Subject: [PATCH] Port fix from ykpiv-minidriver:

commit 79ae87153c2be06e8193a491e26b799e3b5ba028
Author: Oscar K So JR <oscar@yubico.com>
Date:   Mon Jan 30 22:08:29 2017 +0000

    Fixed Issue #78 - P2 Bug: MXCT352 - Importing PKCS#12 with key size 4096 bits crashed CertUtil.exe
---
 lib/ykpiv.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ykpiv.c b/lib/ykpiv.c
index da4fa44..8b97b41 100644
--- a/lib/ykpiv.c
+++ b/lib/ykpiv.c
@@ -941,6 +941,10 @@ ykpiv_rc ykpiv_import_private_key(ykpiv_state *state, const unsigned char key, u
   if (state == NULL)
     return YKPIV_GENERIC_ERROR;
 
+  if (p_len + q_len + dp_len + dq_len + qinv_len + ec_data_len >= sizeof(key_data)) {
+    return YKPIV_SIZE_ERROR;
+  }
+
   if (key == YKPIV_KEY_CARDMGM ||
       key < YKPIV_KEY_RETIRED1 ||
       (key > YKPIV_KEY_RETIRED20 && key < YKPIV_KEY_AUTHENTICATION) ||