# HG changeset patch # User Mychaela Falconia # Date 1614231867 0 # Node ID 60411fd4b803c509746460292226a6b6db027831 # Parent be1a759453ef76cc2af4c028f6047b5300640f3f simtool code: cmd_get_response() factored out of stktest.c diff -r be1a759453ef -r 60411fd4b803 simtool/Makefile --- a/simtool/Makefile Thu Feb 25 05:40:19 2021 +0000 +++ b/simtool/Makefile Thu Feb 25 05:44:27 2021 +0000 @@ -1,13 +1,13 @@ CC= gcc CFLAGS= -O2 -I/usr/include/PCSC -I../libcommon PROG= fc-simtool -OBJS= a38.o chv.o chvext.o curfile.o dispatch.o dumpdir.o fplmn.o grcard1.o \ - grcard2.o hlread.o inval_rehab.o lndwrite.o main.o miscadm.o opldump.o \ - pbcommon.o pbdump.o pberase.o pbrestore.o pbupd_imm.o pbupd_immhex.o \ - plmnsel.o pnndump.o readcmd.o readops.o restorebin.o savebin.o script.o\ - select.o smserase.o smsp_common.o smsp_dump.o smsp_erase.o \ - smsp_restore.o smsp_set.o sstlist.o stktest.o sysmo.o telsum.o \ - usersum.o writecmd.o writeops.o +OBJS= a38.o chv.o chvext.o curfile.o dispatch.o dumpdir.o fplmn.o getresp.o \ + grcard1.o grcard2.o hlread.o inval_rehab.o lndwrite.o main.o miscadm.o \ + opldump.o pbcommon.o pbdump.o pberase.o pbrestore.o pbupd_imm.o \ + pbupd_immhex.o plmnsel.o pnndump.o readcmd.o readops.o restorebin.o \ + savebin.o script.o select.o smserase.o smsp_common.o smsp_dump.o \ + smsp_erase.o smsp_restore.o smsp_set.o sstlist.o stktest.o sysmo.o \ + telsum.o usersum.o writecmd.o writeops.o LIBS= ../libcommon/libcommon.a INSTBIN=/opt/freecalypso/bin diff -r be1a759453ef -r 60411fd4b803 simtool/getresp.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/simtool/getresp.c Thu Feb 25 05:44:27 2021 +0000 @@ -0,0 +1,39 @@ +/* + * This module implements an elementary GET RESPONSE command + */ + +#include +#include +#include +#include "simresp.h" + +cmd_get_response(argc, argv, outf) + char **argv; + FILE *outf; +{ + u_char cmd[5]; + int rc; + unsigned len; + + len = strtoul(argv[1], 0, 0); + if (len < 1 || len > 256) { + fprintf(stderr, "error: length argument is out of range\n"); + return(-1); + } + /* GET RESPONSE command APDU */ + cmd[0] = 0xA0; + cmd[1] = 0xC0; + cmd[2] = 0; + cmd[3] = 0; + cmd[4] = len; + rc = apdu_exchange(cmd, 5); + if (rc < 0) + return(rc); + if (sim_resp_sw != 0x9000) { + fprintf(stderr, "bad SW resp to GET RESPONSE: %04X\n", + sim_resp_sw); + return(-1); + } + display_sim_resp_in_hex(outf); + return(0); +} diff -r be1a759453ef -r 60411fd4b803 simtool/stktest.c --- a/simtool/stktest.c Thu Feb 25 05:40:19 2021 +0000 +++ b/simtool/stktest.c Thu Feb 25 05:44:27 2021 +0000 @@ -79,34 +79,3 @@ printf("%04X\n", sim_resp_sw); return(0); } - -cmd_get_response(argc, argv, outf) - char **argv; - FILE *outf; -{ - u_char cmd[5]; - int rc; - unsigned len; - - len = strtoul(argv[1], 0, 0); - if (len < 1 || len > 256) { - fprintf(stderr, "error: length argument is out of range\n"); - return(-1); - } - /* GET RESPONSE command APDU */ - cmd[0] = 0xA0; - cmd[1] = 0xC0; - cmd[2] = 0; - cmd[3] = 0; - cmd[4] = len; - rc = apdu_exchange(cmd, 5); - if (rc < 0) - return(rc); - if (sim_resp_sw != 0x9000) { - fprintf(stderr, "bad SW resp to GET RESPONSE: %04X\n", - sim_resp_sw); - return(-1); - } - display_sim_resp_in_hex(outf); - return(0); -}