aboutsummaryrefslogtreecommitdiffstats
path: root/scd/app-geldkarte.c
diff options
context:
space:
mode:
Diffstat (limited to 'scd/app-geldkarte.c')
-rw-r--r--scd/app-geldkarte.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/scd/app-geldkarte.c b/scd/app-geldkarte.c
index 85bcedc4f..141985932 100644
--- a/scd/app-geldkarte.c
+++ b/scd/app-geldkarte.c
@@ -39,7 +39,6 @@
#include "../common/i18n.h"
#include "iso7816.h"
-#include "app-common.h"
#include "../common/tlv.h"
@@ -277,7 +276,7 @@ app_select_geldkarte (app_t app)
static char const aid[] =
{ 0xD2, 0x76, 0x00, 0x00, 0x25, 0x45, 0x50, 0x02, 0x00 };
gpg_error_t err;
- int slot = app->slot;
+ int slot = app_get_slot (app);
unsigned char *result = NULL;
size_t resultlen;
struct app_local_s *ld;
@@ -312,21 +311,22 @@ app_select_geldkarte (app_t app)
goto leave; /* Probably not a Geldkarte. */
}
- app->apptype = "GELDKARTE";
+ app->apptype = APPTYPE_GELDKARTE;
app->fnc.deinit = do_deinit;
+ app->fnc.reselect = NULL;
/* If we don't have a serialno yet construct it from the EF_ID. */
- if (!app->serialno)
+ if (!app->card->serialno)
{
- app->serialno = xtrymalloc (10);
- if (!app->serialno)
+ app->card->serialno = xtrymalloc (10);
+ if (!app->card->serialno)
{
err = gpg_error_from_syserror ();
goto leave;
}
- memcpy (app->serialno, result, 10);
- app->serialnolen = 10;
- err = app_munge_serialno (app);
+ memcpy (app->card->serialno, result, 10);
+ app->card->serialnolen = 10;
+ err = app_munge_serialno (app->card);
if (err)
goto leave;
}