Remove the FreeBSD hexdump(3) code.
It was used for easing up development but is not needed anymore.
This commit is contained in:
Romain Tartiere
parent
f5a95b1c57
commit
eca3c540ad
4 changed files with 0 additions and 300 deletions
|
|
@ -4,10 +4,7 @@ AM_LDFLAGS = @LIBNFC_LIBS@
|
||||||
|
|
||||||
lib_LTLIBRARIES = libfreefare.la
|
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 \
|
libfreefare_la_SOURCES = freefare.c \
|
||||||
hexdump.c \
|
|
||||||
mifare_classic.c \
|
mifare_classic.c \
|
||||||
mifare_ultralight.c \
|
mifare_ultralight.c \
|
||||||
mifare_desfire.c \
|
mifare_desfire.c \
|
||||||
|
|
@ -19,10 +16,6 @@ libfreefare_la_SOURCES = freefare.c \
|
||||||
mifare_application.c \
|
mifare_application.c \
|
||||||
tlv.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_la_HEADERS = freefare.h
|
||||||
libfreefare_ladir = $(includedir)
|
libfreefare_ladir = $(includedir)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -47,9 +47,6 @@
|
||||||
#include <freefare.h>
|
#include <freefare.h>
|
||||||
#include "freefare_internal.h"
|
#include "freefare_internal.h"
|
||||||
|
|
||||||
// TODO Remove this
|
|
||||||
#include <libutil.h>
|
|
||||||
|
|
||||||
#pragma pack (push)
|
#pragma pack (push)
|
||||||
#pragma pack (1)
|
#pragma pack (1)
|
||||||
struct mifare_desfire_raw_file_settings {
|
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);
|
* BUFFER_APPEND_LE (buffer, data, 3, 4);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// FIXME: remove debugging stuff
|
|
||||||
#if _BYTE_ORDER != _LITTLE_ENDIAN
|
#if _BYTE_ORDER != _LITTLE_ENDIAN
|
||||||
#define BUFFER_APPEND_LE(buffer, data, data_size, field_size) \
|
#define BUFFER_APPEND_LE(buffer, data, data_size, field_size) \
|
||||||
do { \
|
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 __data_size = data_size; \
|
||||||
size_t __field_size = field_size; \
|
size_t __field_size = field_size; \
|
||||||
while (__field_size--, __data_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]; \
|
buffer[__##buffer##_n++] = ((uint8_t *)&data)[__field_size]; \
|
||||||
} \
|
} \
|
||||||
} while (0)
|
} 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
|
* 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.
|
* response buffer's size is set according to the quantity od data received.
|
||||||
*/
|
*/
|
||||||
// FIXME: remove debugging stuff
|
|
||||||
#define DESFIRE_TRANSCEIVE(tag, msg, res) \
|
#define DESFIRE_TRANSCEIVE(tag, msg, res) \
|
||||||
do { \
|
do { \
|
||||||
errno = 0; \
|
errno = 0; \
|
||||||
MIFARE_DESFIRE (tag)->last_picc_error = OPERATION_OK; \
|
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))) \
|
if (!(nfc_initiator_transceive_dep_bytes (tag->device, msg, __##msg##_n, res, &__##res##_n))) \
|
||||||
return errno = EIO, -1; \
|
return errno = EIO, -1; \
|
||||||
hexdump (res, __##res##_n, "<--- ", 0); \
|
|
||||||
if ((1 == __##res##_n) && (OPERATION_OK != res[0]) && (ADDITIONAL_FRAME != res[0])) \
|
if ((1 == __##res##_n) && (OPERATION_OK != res[0]) && (ADDITIONAL_FRAME != res[0])) \
|
||||||
return MIFARE_DESFIRE (tag)->last_picc_error = res[0], -1; \
|
return MIFARE_DESFIRE (tag)->last_picc_error = res[0], -1; \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
|
||||||
188
libutil.h
188
libutil.h
|
|
@ -1,188 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 1996 Peter Wemm <peter@FreeBSD.org>.
|
|
||||||
* All rights reserved.
|
|
||||||
* Copyright (c) 2002 Networks Associates Technology, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Portions of this software were developed for the FreeBSD Project by
|
|
||||||
* ThinkSec AS and NAI Labs, the Security Research Division of Network
|
|
||||||
* Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
|
|
||||||
* ("CBOSS"), as part of the DARPA CHATS research program.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, is 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.
|
|
||||||
* 3. The name of the author may not be used to endorse or promote
|
|
||||||
* products derived from this software without specific prior written
|
|
||||||
* permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
|
|
||||||
*
|
|
||||||
* $FreeBSD: stable/8/lib/libutil/libutil.h 185548 2008-12-02 06:50:26Z peter $
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _LIBUTIL_H_
|
|
||||||
#define _LIBUTIL_H_
|
|
||||||
|
|
||||||
#define PROPERTY_MAX_NAME 64
|
|
||||||
#define PROPERTY_MAX_VALUE 512
|
|
||||||
|
|
||||||
/* for properties.c */
|
|
||||||
typedef struct _property {
|
|
||||||
struct _property *next;
|
|
||||||
char *name;
|
|
||||||
char *value;
|
|
||||||
} *properties;
|
|
||||||
|
|
||||||
#ifdef _SYS_PARAM_H_
|
|
||||||
/* for pidfile.c */
|
|
||||||
struct pidfh {
|
|
||||||
int pf_fd;
|
|
||||||
char pf_path[MAXPATHLEN + 1];
|
|
||||||
__dev_t pf_dev;
|
|
||||||
ino_t pf_ino;
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Avoid pulling in all the include files for no need */
|
|
||||||
struct termios;
|
|
||||||
struct winsize;
|
|
||||||
struct utmp;
|
|
||||||
struct in_addr;
|
|
||||||
struct kinfo_file;
|
|
||||||
struct kinfo_vmentry;
|
|
||||||
|
|
||||||
__BEGIN_DECLS
|
|
||||||
void clean_environment(const char * const *_white,
|
|
||||||
const char * const *_more_white);
|
|
||||||
int extattr_namespace_to_string(int _attrnamespace, char **_string);
|
|
||||||
int extattr_string_to_namespace(const char *_string, int *_attrnamespace);
|
|
||||||
int flopen(const char *_path, int _flags, ...);
|
|
||||||
void hexdump(const void *ptr, int length, const char *hdr, int flags);
|
|
||||||
void login(struct utmp *_ut);
|
|
||||||
int login_tty(int _fd);
|
|
||||||
int logout(const char *_line);
|
|
||||||
void logwtmp(const char *_line, const char *_name, const char *_host);
|
|
||||||
void trimdomain(char *_fullhost, int _hostsize);
|
|
||||||
int openpty(int *_amaster, int *_aslave, char *_name,
|
|
||||||
struct termios *_termp, struct winsize *_winp);
|
|
||||||
int forkpty(int *_amaster, char *_name,
|
|
||||||
struct termios *_termp, struct winsize *_winp);
|
|
||||||
int humanize_number(char *_buf, size_t _len, int64_t _number,
|
|
||||||
const char *_suffix, int _scale, int _flags);
|
|
||||||
int expand_number(const char *_buf, int64_t *_num);
|
|
||||||
const char *uu_lockerr(int _uu_lockresult);
|
|
||||||
int uu_lock(const char *_ttyname);
|
|
||||||
int uu_unlock(const char *_ttyname);
|
|
||||||
int uu_lock_txfr(const char *_ttyname, pid_t _pid);
|
|
||||||
int _secure_path(const char *_path, uid_t _uid, gid_t _gid);
|
|
||||||
properties properties_read(int fd);
|
|
||||||
void properties_free(properties list);
|
|
||||||
char *property_find(properties list, const char *name);
|
|
||||||
char *auth_getval(const char *name);
|
|
||||||
int realhostname(char *host, size_t hsize, const struct in_addr *ip);
|
|
||||||
struct sockaddr;
|
|
||||||
int realhostname_sa(char *host, size_t hsize, struct sockaddr *addr,
|
|
||||||
int addrlen);
|
|
||||||
|
|
||||||
int kld_isloaded(const char *name);
|
|
||||||
int kld_load(const char *name);
|
|
||||||
struct kinfo_file *
|
|
||||||
kinfo_getfile(pid_t _pid, int *_cntp);
|
|
||||||
struct kinfo_vmentry *
|
|
||||||
kinfo_getvmmap(pid_t _pid, int *_cntp);
|
|
||||||
|
|
||||||
#ifdef _STDIO_H_ /* avoid adding new includes */
|
|
||||||
char *fparseln(FILE *, size_t *, size_t *, const char[3], int);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _PWD_H_
|
|
||||||
int pw_copy(int _ffd, int _tfd, const struct passwd *_pw, struct passwd *_old_pw);
|
|
||||||
struct passwd *pw_dup(const struct passwd *_pw);
|
|
||||||
int pw_edit(int _notsetuid);
|
|
||||||
int pw_equal(const struct passwd *_pw1, const struct passwd *_pw2);
|
|
||||||
void pw_fini(void);
|
|
||||||
int pw_init(const char *_dir, const char *_master);
|
|
||||||
char *pw_make(const struct passwd *_pw);
|
|
||||||
int pw_mkdb(const char *_user);
|
|
||||||
int pw_lock(void);
|
|
||||||
struct passwd *pw_scan(const char *_line, int _flags);
|
|
||||||
const char *pw_tempname(void);
|
|
||||||
int pw_tmp(int _mfd);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _GRP_H_
|
|
||||||
int gr_equal(const struct group *gr1, const struct group *gr2);
|
|
||||||
char *gr_make(const struct group *gr);
|
|
||||||
struct group *gr_dup(const struct group *gr);
|
|
||||||
struct group *gr_scan(const char *line);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _SYS_PARAM_H_
|
|
||||||
struct pidfh *pidfile_open(const char *path, mode_t mode, pid_t *pidptr);
|
|
||||||
int pidfile_write(struct pidfh *pfh);
|
|
||||||
int pidfile_close(struct pidfh *pfh);
|
|
||||||
int pidfile_remove(struct pidfh *pfh);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
__END_DECLS
|
|
||||||
|
|
||||||
#define UU_LOCK_INUSE (1)
|
|
||||||
#define UU_LOCK_OK (0)
|
|
||||||
#define UU_LOCK_OPEN_ERR (-1)
|
|
||||||
#define UU_LOCK_READ_ERR (-2)
|
|
||||||
#define UU_LOCK_CREAT_ERR (-3)
|
|
||||||
#define UU_LOCK_WRITE_ERR (-4)
|
|
||||||
#define UU_LOCK_LINK_ERR (-5)
|
|
||||||
#define UU_LOCK_TRY_ERR (-6)
|
|
||||||
#define UU_LOCK_OWNER_ERR (-7)
|
|
||||||
|
|
||||||
/* return values from realhostname() */
|
|
||||||
#define HOSTNAME_FOUND (0)
|
|
||||||
#define HOSTNAME_INCORRECTNAME (1)
|
|
||||||
#define HOSTNAME_INVALIDADDR (2)
|
|
||||||
#define HOSTNAME_INVALIDNAME (3)
|
|
||||||
|
|
||||||
/* fparseln(3) */
|
|
||||||
#define FPARSELN_UNESCESC 0x01
|
|
||||||
#define FPARSELN_UNESCCONT 0x02
|
|
||||||
#define FPARSELN_UNESCCOMM 0x04
|
|
||||||
#define FPARSELN_UNESCREST 0x08
|
|
||||||
#define FPARSELN_UNESCALL 0x0f
|
|
||||||
|
|
||||||
/* pw_scan() */
|
|
||||||
#define PWSCAN_MASTER 0x01
|
|
||||||
#define PWSCAN_WARN 0x02
|
|
||||||
|
|
||||||
/* humanize_number(3) */
|
|
||||||
#define HN_DECIMAL 0x01
|
|
||||||
#define HN_NOSPACE 0x02
|
|
||||||
#define HN_B 0x04
|
|
||||||
#define HN_DIVISOR_1000 0x08
|
|
||||||
|
|
||||||
#define HN_GETSCALE 0x10
|
|
||||||
#define HN_AUTOSCALE 0x20
|
|
||||||
|
|
||||||
/* hexdump(3) */
|
|
||||||
#define HD_COLUMN_MASK 0xff
|
|
||||||
#define HD_DELIM_MASK 0xff00
|
|
||||||
#define HD_OMIT_COUNT (1 << 16)
|
|
||||||
#define HD_OMIT_HEX (1 << 17)
|
|
||||||
#define HD_OMIT_CHARS (1 << 18)
|
|
||||||
|
|
||||||
#endif /* !_LIBUTIL_H_ */
|
|
||||||
Loading…
Add table
Reference in a new issue