|
|
- From 693b3ac5a53e89a0cdeab0f728d24a6e16864f5c Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
- Date: Fri, 12 Apr 2013 15:33:31 +0700
- Subject: [PATCH 15/18] OpenPGP: Delete key as file, for Gnuk.
-
- ---
- src/libopensc/card-openpgp.c | 51 +++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 50 insertions(+), 1 deletion(-)
-
- diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
- index a666163..19d3b04 100644
- --- a/src/libopensc/card-openpgp.c
- +++ b/src/libopensc/card-openpgp.c
- @@ -2437,6 +2437,44 @@ static int pgp_card_ctl(sc_card_t *card, unsigned long cmd, void *ptr)
- LOG_FUNC_RETURN(card->ctx, SC_ERROR_NOT_SUPPORTED);
- }
-
- +
- +/* Internal: Delete key */
- +static int
- +gnuk_delete_key(sc_card_t *card, u8 key_id)
- +{
- + sc_context_t *ctx = card->ctx;
- + int r = SC_SUCCESS;
- + u8 *data = NULL;
- +
- + LOG_FUNC_CALLED(ctx);
- +
- + /* Delete fingerprint */
- + sc_log(ctx, "Delete fingerprints");
- + r = pgp_put_data(card, 0xC6 + key_id, NULL, 0);
- + LOG_TEST_RET(ctx, r, "Failed to delete fingerprints");
- + /* Delete creation time */
- + sc_log(ctx, "Delete creation time");
- + r = pgp_put_data(card, 0xCD + key_id, NULL, 0);
- + LOG_TEST_RET(ctx, r, "Failed to delete creation time");
- +
- + /* Rewrite Extended Header List */
- + sc_log(ctx, "Rewrite Extended Header List");
- +
- + if (key_id == 1)
- + data = "\x4D\x02\xB6";
- + else if (key_id == 2)
- + data = "\x4D\x02\xB8";
- + else if (key_id == 3)
- + data = "\x4D\x02\xA4";
- + else
- + LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
- +
- + r = pgp_put_data(card, 0x4D, data, strlen(data) + 1);
- +
- + LOG_FUNC_RETURN(ctx, r);
- +}
- +
- +
- /* ABI: DELETE FILE */
- static int
- pgp_delete_file(sc_card_t *card, const sc_path_t *path)
- @@ -2444,6 +2482,7 @@ pgp_delete_file(sc_card_t *card, const sc_path_t *path)
- struct pgp_priv_data *priv = DRVDATA(card);
- struct blob *blob;
- sc_file_t *file;
- + u8 key_id;
- int r;
-
- LOG_FUNC_CALLED(card->ctx);
- @@ -2459,10 +2498,20 @@ pgp_delete_file(sc_card_t *card, const sc_path_t *path)
- if (blob == priv->mf)
- LOG_FUNC_RETURN(card->ctx, SC_ERROR_NOT_SUPPORTED);
-
- - if (file->id == 0xB601 || file->id == 0xB801 || file->id == 0xA401) {
- + if (card->type != SC_CARD_TYPE_OPENPGP_GNUK &&
- + (file->id == 0xB601 || file->id == 0xB801 || file->id == 0xA401)) {
- /* These tags are just symbolic. We don't really delete it. */
- r = SC_SUCCESS;
- }
- + else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == 0xB601) {
- + r = gnuk_delete_key(card, 1);
- + }
- + else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == 0xB801) {
- + r = gnuk_delete_key(card, 2);
- + }
- + else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == 0xA401) {
- + r = gnuk_delete_key(card, 3);
- + }
- else {
- /* call pgp_put_data() with zero-sized NULL-buffer to zap the DO contents */
- r = pgp_put_data(card, file->id, NULL, 0);
- --
- 1.9.3
-
|
