crewID/libfreefare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the FreeBSD hexdump(3) code.

Browse source 
It was used for easing up development but is not needed anymore.
This commit is contained in:
Romain Tartiere 2010-07-27 08:35:15 +00:00
parent f5a95b1c57
commit eca3c540ad
4 changed files with 0 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libfreefare/Makefile.am
View file

@ -4,10 +4,7 @@ AM_LDFLAGS = @LIBNFC_LIBS@
lib_LTLIBRARIES = libfreefare.la
# TODO: Remove hexdump.c
# XXX: Remove hexdump.c on systems with a hexdump(1) function in libutil.
libfreefare_la_SOURCES = freefare.c \
hexdump.c \
mifare_classic.c \
mifare_ultralight.c \
mifare_desfire.c \
@ -19,10 +16,6 @@ libfreefare_la_SOURCES = freefare.c \
mifare_application.c \
tlv.c
# TODO: Remove this
# XXX: Uncomment on FreeBSD to link with libutil which provides hexdump(1).
# libfreefare_la_LIBADD = -lutil
libfreefare_la_HEADERS = freefare.h
libfreefare_ladir = $(includedir)

96
libfreefare/hexdump.c
View file

@ -1,96 +0,0 @@
/*-
* Copyright (c) 1986, 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
* All or some portions of this file are derived from material licensed
* to the University of California by American Telephone and Telegraph
* Co. or Unix System Laboratories, Inc. and are reproduced herein with
* the permission of UNIX System Laboratories, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)subr_prf.c 8.3 (Berkeley) 1/21/94
*/
//#include <sys/cdefs.h>
//__FBSDID("$FreeBSD: stable/8/lib/libutil/hexdump.c 180161 2008-07-01 22:30:57Z jhb $");
#include <sys/types.h>
#include <libutil.h>
#include <stdio.h>
void
hexdump(const void *ptr, int length, const char *hdr, int flags)
{
int i, j, k;
int cols;
const unsigned char *cp;
char delim;
if ((flags & HD_DELIM_MASK) != 0)
delim = (flags & HD_DELIM_MASK) >> 8;
else
delim = ' ';
if ((flags & HD_COLUMN_MASK) != 0)
cols = flags & HD_COLUMN_MASK;
else
cols = 16;
cp = ptr;
for (i = 0; i < length; i+= cols) {
if (hdr != NULL)
printf("%s", hdr);
if ((flags & HD_OMIT_COUNT) == 0)
printf("%04x ", i);
if ((flags & HD_OMIT_HEX) == 0) {
for (j = 0; j < cols; j++) {
k = i + j;
if (k < length)
printf("%c%02x", delim, cp[k]);
else
printf(" ");
}
}
if ((flags & HD_OMIT_CHARS) == 0) {
printf(" |");
for (j = 0; j < cols; j++) {
k = i + j;
if (k >= length)
printf(" ");
else if (cp[k] >= ' ' && cp[k] <= '~')
printf("%c", cp[k]);
else
printf(".");
}
printf("|");
}
printf("\n");
}
}

9
libfreefare/mifare_desfire.c
View file

@ -47,9 +47,6 @@
#include <freefare.h>
#include "freefare_internal.h"
// TODO Remove this
#include <libutil.h>
#pragma pack (push)
#pragma pack (1)
struct mifare_desfire_raw_file_settings {
@ -152,15 +149,12 @@ static ssize_t read_data (MifareTag tag, uint8_t command, uint8_t file_no, off_
* BUFFER_APPEND_LE (buffer, data, 3, 4);
*/
// FIXME: remove debugging stuff
#if _BYTE_ORDER != _LITTLE_ENDIAN
#define BUFFER_APPEND_LE(buffer, data, data_size, field_size) \
do { \
printf ("append (%p, %lu, %p, %d (%d))\n", buffer, __##buffer##_n, (void *)(&data), (int) data_size, (int) field_size); \
size_t __data_size = data_size; \
size_t __field_size = field_size; \
while (__field_size--, __data_size--) { \
printf (" buffer[%lu] <- %02x\n", __##buffer##_n, ((uint8_t *)&data)[__field_size]); \
buffer[__##buffer##_n++] = ((uint8_t *)&data)[__field_size]; \
} \
} while (0)
@ -181,15 +175,12 @@ static ssize_t read_data (MifareTag tag, uint8_t command, uint8_t file_no, off_
* Transmit the message msg to the NFC tag and receive the response res. The
* response buffer's size is set according to the quantity od data received.
*/
// FIXME: remove debugging stuff
#define DESFIRE_TRANSCEIVE(tag, msg, res) \
do { \
errno = 0; \
MIFARE_DESFIRE (tag)->last_picc_error = OPERATION_OK; \
hexdump (msg, __##msg##_n, "---> ", 0); \
if (!(nfc_initiator_transceive_dep_bytes (tag->device, msg, __##msg##_n, res, &__##res##_n))) \
return errno = EIO, -1; \
hexdump (res, __##res##_n, "<--- ", 0); \
if ((1 == __##res##_n) && (OPERATION_OK != res[0]) && (ADDITIONAL_FRAME != res[0])) \
return MIFARE_DESFIRE (tag)->last_picc_error = res[0], -1; \
} while (0)