Change saved function pointer signature and fix typo in Windows makefile

OpenSC · Mar 22, 2019 · 9028627 · 9028627
1 parent 75d0a6f
commit 9028627
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak
@@ -34,7 +34,7 @@ OBJECTS = \
  pkcs15-actalis.obj pkcs15-atrust-acos.obj pkcs15-tccardos.obj pkcs15-piv.obj \
  pkcs15-cac.obj pkcs15-esinit.obj pkcs15-westcos.obj pkcs15-pteid.obj pkcs15-din-66291.obj \
  pkcs15-oberthur.obj pkcs15-itacns.obj pkcs15-gemsafeV1.obj pkcs15-sc-hsm.obj \
- pkcs15-dnie.obj pkcs15-gids.obj pkcs15-iasecc.obj pkcs15-jpki.obj
+ pkcs15-dnie.obj pkcs15-gids.obj pkcs15-iasecc.obj pkcs15-jpki.obj \
  pkcs15-esteid2018.obj \
  compression.obj p15card-helper.obj sm.obj \
  aux-data.obj \

diff --git a/src/libopensc/card-esteid2018.c b/src/libopensc/card-esteid2018.c
@@ -146,8 +146,8 @@ static int esteid_select_file(struct sc_card *card, const struct sc_path *in_pat
 // temporary hack, overload 6B00 SW processing
 static int esteid_read_binary(struct sc_card *card, unsigned int idx, u8 *buf, size_t count, unsigned long flags) {
  int r;
+ int (*saved)(struct sc_card *, unsigned int, unsigned int) = card->ops->check_sw;
  LOG_FUNC_CALLED(card->ctx);
- void *saved = card->ops->check_sw;
  card->ops->check_sw = esteid_check_sw;
  r = iso_ops->read_binary(card, idx, buf, count, flags);
  card->ops->check_sw = saved;