sc-hsm-tool: check for expected tags (.pka files)

OpenSC · Jun 20, 2019 · 5750d63 · 5750d63
1 parent 48ef02c
commit 5750d63
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/tools/sc-hsm-tool.c b/src/tools/sc-hsm-tool.c
@@ -1943,6 +1943,11 @@ static int register_public_key(sc_context_t *ctx, sc_card_t *card, const char *i
  r = -1;
  goto err;
  }
+ if (tag_out != 0x7) {
+ fprintf(stderr, "Wrong tag when reading public key: got %x, expected %x\n", tag_out, 0x7);
+ r = -1;
+ goto err;
+ }
  pk = buf;
  pk_len = taglen;
  buf += taglen;
@@ -1953,6 +1958,11 @@ static int register_public_key(sc_context_t *ctx, sc_card_t *card, const char *i
  r = -1;
  goto err;
  }
+ if (tag_out != 0x1f21) {
+ fprintf(stderr, "Wrong tag when reading device certificate: got %x, expected %x\n", tag_out, 0x1f21);
+ r = -1;
+ goto err;
+ }
  devcert = buf;
  devcert_len = taglen;
  buf += taglen;
@@ -1963,6 +1973,11 @@ static int register_public_key(sc_context_t *ctx, sc_card_t *card, const char *i
  r = -1;
  goto err;
  }
+ if (tag_out != 0x1f21) {
+ fprintf(stderr, "Wrong tag when reading device CA: got %x, expected %x\n", tag_out, 0x1f21);
+ r = -1;
+ goto err;
+ }
  dicacert = buf;
  dicacert_len = taglen;