From e4057ef163c1a01d06db77a128967cd004a71f73 Mon Sep 17 00:00:00 2001 From: Romain Tartiere Date: Sun, 26 Dec 2010 15:46:07 +0000 Subject: [PATCH] Update man pages. --- NEWS | 5 +++- libfreefare/Makefile.am | 5 ++++ libfreefare/mifare_desfire.3 | 46 +++++++++++++++++++++++++++++++++++- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 07b4a5f..e52b5b7 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,10 @@ Changes between 0.2.3 and 0.3.0 [XX xxx XXXX] *) Add support for ISO and AES authentication through mifare_desfire_authenticate_iso() and mifare_desfire_authenticate_aes(). - *) Add support for 3K3DES and AES cryptographic operations. + *) Add support for 3K3DES and AES cryptographic operations and add new + functions mifare_desfire_3k3des_key_new(), + mifare_desfire_3k3des_key_new_with_version(), mifare_desfire_aes_key_new() + and mifare_desfire_aes_key_new_with_version() for generating keys. *) New functions mifare_desfire_free_mem(), mifare_desfire_set_configuration(), mifare_desfire_set_default_key(), mifare_desfire_set_ats(), mifare_desfire_get_card_uid(), for Mifare diff --git a/libfreefare/Makefile.am b/libfreefare/Makefile.am index a2a3139..713dc05 100644 --- a/libfreefare/Makefile.am +++ b/libfreefare/Makefile.am @@ -108,7 +108,9 @@ linkedman = \ mifare_desfire.3 mifare_desfire_disconnect.3 \ mifare_desfire.3 mifare_desfire_format_picc.3 \ mifare_desfire.3 mifare_desfire_free_application_ids.3 \ + mifare_desfire.3 mifare_desfire_free_mem.3 \ mifare_desfire.3 mifare_desfire_get_application_ids.3 \ + mifare_desfire.3 mifare_desfire_get_card_uid.3 \ mifare_desfire.3 mifare_desfire_get_file_ids.3 \ mifare_desfire.3 mifare_desfire_get_file_settings.3 \ mifare_desfire.3 mifare_desfire_get_key_settings.3 \ @@ -123,6 +125,9 @@ linkedman = \ mifare_desfire.3 mifare_desfire_read_records.3 \ mifare_desfire.3 mifare_desfire_read_records_ex.3 \ mifare_desfire.3 mifare_desfire_select_application.3 \ + mifare_desfire.3 mifare_desfire_set_ats.3 \ + mifare_desfire.3 mifare_desfire_set_configuration.3 \ + mifare_desfire.3 mifare_desfire_set_default_key.3 \ mifare_desfire.3 mifare_desfire_write_data.3 \ mifare_desfire.3 mifare_desfire_write_data_ex.3 \ mifare_desfire.3 mifare_desfire_write_record.3 \ diff --git a/libfreefare/mifare_desfire.3 b/libfreefare/mifare_desfire.3 index 7b77beb..25b5b95 100644 --- a/libfreefare/mifare_desfire.3 +++ b/libfreefare/mifare_desfire.3 @@ -45,6 +45,11 @@ .Nm mifare_desfire_format_picc , .\" .Nm mifare_desfire_get_version , +.Nm mifare_desfire_free_mem , +.Nm mifare_desfire_set_configuration , +.Nm mifare_desfire_set_default_key , +.Nm mifare_desfire_set_ats , +.Nm mifare_desfire_get_card_uid , .\" .Nm mifare_desfire_get_file_ids , .Nm mifare_desfire_get_file_settings , @@ -125,6 +130,16 @@ Mifare card manipulation library (libfreefare, \-lfreefare) .Ft int .Fn mifare_desfire_get_version "MifareTag tag" "struct mifare_desfire_version_info *version_info" .Ft int +.Fn mifare_desfire_free_mem "MifareTag tag" "uint32_t *size" +.Ft int +.Fn mifare_desfire_set_configuration "MifareTag tag" "bool disable_format" "bool enable_random_uid" +.Ft int +.Fn mifare_desfire_set_default_key "MifareTag tag" "MifareDESFireKey key" +.Ft int +.Fn mifare_desfire_set_ats "MifareTag tag" "uint8_t *ats" +.Ft int +.Fn mifare_desfire_get_card_uid "MifareTag tag" "char **uid" +.Ft int .Fn mifare_desfire_get_file_ids "MifareTag tag" "uint8_t *files[]" "size_t *count" .Ft int .Fn mifare_desfire_get_file_settings "MifareTag tag" "uint8_t file_no" "struct mifare_desfire_file_settings *settings" @@ -215,10 +230,39 @@ function retrieve various information about the provided .Vt tag , including UID, batch number, production date, and hardware and software information. Refer to the freefare.h header file for details about the -.Vt settings +.Vt version_info field. .Pp The +.Fn mifare_desfire_free_mem +functions returns the +.Vt size +of the free memory on the PICC (in bytes). +.Pp +The +.Fn mifare_desfire_set_configuration +function can be used to desactivate the format function when setting +.Vt disable_format +to a value different from 0, or swicth the card to use random UDI setting +.Vt enable_random_uid +to a non-zero value. +.Pp +The +.Vt mifare_desfire_set_default_key +function sets the +.Vt key +argument as the default key for new applications. +.Pp +The +.Nm mifare_desfire_set_ats +function replace the ATS bytes returned by PICC when it is selected. +.Pp +The +.Nm mifare_desfire_get_card_uid +function can be used with a PICC configured for using random UID to retrieve +the original UID of the target. +.Pp +The .Fn mifare_desfire_format_picc function resets .Vt tag