[pkg-opensc-commit] [opensc] 137/295: dnie: force caching of pin if DNIe is version 3.0

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository opensc.

commit 06292563bc71512d4a17049bf04b75b80117bf3f
Author: ricky <rickyepoderi at yahoo.es>
Date:   Sat Dec 17 12:15:52 2016 +0100

    dnie: force caching of pin if DNIe is version 3.0
---
 src/libopensc/cwa-dnie.h    |  1 +
 src/libopensc/pkcs15-dnie.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/libopensc/cwa-dnie.h b/src/libopensc/cwa-dnie.h
index bb272c2..723ea80 100644
--- a/src/libopensc/cwa-dnie.h
+++ b/src/libopensc/cwa-dnie.h
@@ -62,6 +62,7 @@ struct cwa_provider_st;
 #define GET_DNIE_UI_CTX(card) (((dnie_private_data_t *) ((card)->drv_data))->ui_ctx)
 
 #define DNIE_30_VERSION 0x04
+#define DNIE_30_CACHE_COUNTER 30000
 
 cwa_provider_t *dnie_get_cwa_provider(sc_card_t * card);
 
diff --git a/src/libopensc/pkcs15-dnie.c b/src/libopensc/pkcs15-dnie.c
index edccdf8..e06851e 100644
--- a/src/libopensc/pkcs15-dnie.c
+++ b/src/libopensc/pkcs15-dnie.c
@@ -27,6 +27,8 @@
 #include "libopensc/log.h"
 #include "libopensc/asn1.h"
 #include "libopensc/pkcs15.h"
+#include "libopensc/cwa14890.h"
+#include "libopensc/cwa-dnie.h"
 
 /* Card driver related */
 #ifdef ENABLE_OPENSSL
@@ -156,6 +158,19 @@ static int sc_pkcs15emu_dnie_init(sc_pkcs15_card_t * p15card)
 	if (dnie_match_card(p15card->card) != 1)
 		return SC_ERROR_WRONG_CARD;
 
+	/* The two keys inside DNIe 3.0 needs login before performing any signature.
+	 * They are CKA_ALWAYS_AUTHENTICATE although they are not tagged like that.
+	 * For the moment caching is forced if 3.0 is detected to make it work properly. */
+	if (p15card->card->atr.value[15] >= DNIE_30_VERSION) {
+		p15card->opts.use_pin_cache = 1;
+		p15card->opts.pin_cache_counter = DNIE_30_CACHE_COUNTER;
+		sc_log(ctx, "DNIe 3.0 detected - PKCS#15 options reset: use_file_cache=%d use_pin_cache=%d pin_cache_counter=%d pin_cache_ignore_user_consent=%d",
+			p15card->opts.use_file_cache,
+			p15card->opts.use_pin_cache,
+			p15card->opts.pin_cache_counter,
+			p15card->opts.pin_cache_ignore_user_consent);
+        }
+
 	/* Set root path of this application */
 	p15card->file_app = sc_file_new();
 	sc_format_path("3F00", &p15card->file_app->path);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/opensc.git