# HG changeset patch # User Mychaela Falconia # Date 1613087773 0 # Node ID 4360a7906f3402400b3d235cf9d6a607d75800d5 # Parent 2c72709e0891a285dd3525e03046430bda0fe48c reversed nibbles parsing functions factored out into libcommon diff -r 2c72709e0891 -r 4360a7906f34 libcommon/Makefile --- a/libcommon/Makefile Thu Feb 11 23:42:53 2021 +0000 +++ b/libcommon/Makefile Thu Feb 11 23:56:13 2021 +0000 @@ -1,7 +1,8 @@ CC= gcc CFLAGS= -O2 -I/usr/include/PCSC OBJS= alpha_decode.o alpha_valid.o apdu.o atr.o cardconnect.o chkblank.o \ - dumpdirfunc.o exit.o hexdump.o hexread.o hexstr.o names.o pinentry.o + dumpdirfunc.o exit.o hexdump.o hexread.o hexstr.o names.o pinentry.o \ + revnibbles.o LIB= libcommon.a all: ${LIB} diff -r 2c72709e0891 -r 4360a7906f34 libcommon/revnibbles.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libcommon/revnibbles.c Thu Feb 11 23:56:13 2021 +0000 @@ -0,0 +1,34 @@ +/* + * This module implements some reversed-nibbles parsing functions. + */ + +#include + +encode_hex_digit(d) + unsigned d; +{ + if (d <= 9) + return(d + '0'); + else + return(d - 10 + 'A'); +} + +decode_reversed_nibbles(bytes, nbytes, dest) + u_char *bytes; + unsigned nbytes; + char *dest; +{ + u_char *sp; + char *dp; + unsigned n, c; + + sp = bytes; + dp = dest; + for (n = 0; n < nbytes; n++) { + c = *sp & 0xF; + *dp++ = encode_hex_digit(c); + c = *sp >> 4; + *dp++ = encode_hex_digit(c); + sp++; + } +} diff -r 2c72709e0891 -r 4360a7906f34 simtool/hlread.c --- a/simtool/hlread.c Thu Feb 11 23:42:53 2021 +0000 +++ b/simtool/hlread.c Thu Feb 11 23:56:13 2021 +0000 @@ -4,40 +4,10 @@ #include #include -#include #include "simresp.h" #include "curfile.h" #include "file_id.h" -encode_hex_digit(d) - unsigned d; -{ - if (d <= 9) - return(d + '0'); - else - return(d - 10 + 'A'); -} - -decode_reversed_nibbles(bytes, nbytes, dest) - u_char *bytes; - unsigned nbytes; - char *dest; -{ - u_char *sp; - char *dp; - unsigned n, c; - - sp = bytes; - dp = dest; - for (n = 0; n < nbytes; n++) { - c = *sp & 0xF; - *dp++ = encode_hex_digit(c); - c = *sp >> 4; - *dp++ = encode_hex_digit(c); - sp++; - } -} - cmd_iccid() { int rc;