From 9bf12ba47f9794e751a300b4c4bf0450641151e9 Mon Sep 17 00:00:00 2001 From: "viktor.tarasov" Date: Fri, 19 Feb 2010 16:41:05 +0000 Subject: [PATCH] entersafe: unify cards behavior - don't throw error when erasing empty card git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4042 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/pkcs15init/pkcs15-entersafe.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pkcs15init/pkcs15-entersafe.c b/src/pkcs15init/pkcs15-entersafe.c index 9f8ed1a9..a392f0e4 100644 --- a/src/pkcs15init/pkcs15-entersafe.c +++ b/src/pkcs15init/pkcs15-entersafe.c @@ -62,7 +62,11 @@ static u8 process_acl_entry(sc_file_t *in, unsigned int method, unsigned int in_ static int entersafe_erase_card(struct sc_profile *profile, sc_card_t *card) { SC_FUNC_CALLED(card->ctx, 1); - return sc_card_ctl(card,SC_CARDCTL_ERASE_CARD,0); + + if (sc_select_file(p15card->card, sc_get_mf_path(), NULL) < 0) + return SC_SUCCESS; + + return sc_card_ctl(card,SC_CARDCTL_ERASE_CARD,0); } static int entersafe_init_card(sc_profile_t *profile, sc_card_t *card)