[libfreefare] 2 new revisions pushed by romain.t...@gmail.com on 2014-04-13 18:46 GMT

9 views
Skip to first unread message

libfr...@googlecode.com

unread,
Apr 13, 2014, 2:46:25 PM4/13/14
to nfc-tool...@googlegroups.com
master moved from 646a20da34f5 to 8290d3d8cc16

2 new revisions:

Revision: 32c585db694a
Author: Romain Tartière <rom...@blogreen.org>
Date: Sun Apr 13 17:57:49 2014 UTC
Log: rnda & rndb are 16 bytes long in 3K3DS and AES mode.
http://code.google.com/p/libfreefare/source/detail?r=32c585db694a

Revision: 8290d3d8cc16
Author: Romain Tartière <rom...@blogreen.org>
Date: Sun Apr 13 18:29:57 2014 UTC
Log: Keys are supposed to be const.
http://code.google.com/p/libfreefare/source/detail?r=8290d3d8cc16

==============================================================================
Revision: 32c585db694a
Author: Romain Tartière <rom...@blogreen.org>
Date: Sun Apr 13 17:57:49 2014 UTC
Log: rnda & rndb are 16 bytes long in 3K3DS and AES mode.

http://code.google.com/p/libfreefare/source/detail?r=32c585db694a

Modified:
/libfreefare/freefare_internal.h
/libfreefare/mifare_desfire_key.c

=======================================
--- /libfreefare/freefare_internal.h Tue Feb 11 16:23:06 2014 UTC
+++ /libfreefare/freefare_internal.h Sun Apr 13 17:57:49 2014 UTC
@@ -243,7 +243,7 @@
uint32_t selected_application;
};

-MifareDESFireKey mifare_desfire_session_key_new (uint8_t rnda[8], uint8_t
rndb[8], MifareDESFireKey authentication_key);
+MifareDESFireKey mifare_desfire_session_key_new (uint8_t rnda[], uint8_t
rndb[], MifareDESFireKey authentication_key);
const char *mifare_desfire_error_lookup (uint8_t error);

struct mifare_ultralight_tag {
=======================================
--- /libfreefare/mifare_desfire_key.c Sat Dec 18 02:28:27 2010 UTC
+++ /libfreefare/mifare_desfire_key.c Sun Apr 13 17:57:49 2014 UTC
@@ -158,7 +158,7 @@
}

MifareDESFireKey
-mifare_desfire_session_key_new (uint8_t rnda[8], uint8_t rndb[8],
MifareDESFireKey authentication_key)
+mifare_desfire_session_key_new (uint8_t rnda[], uint8_t rndb[],
MifareDESFireKey authentication_key)
{
MifareDESFireKey key = NULL;


==============================================================================
Revision: 8290d3d8cc16
Author: Romain Tartière <rom...@blogreen.org>
Date: Sun Apr 13 18:29:57 2014 UTC
Log: Keys are supposed to be const.

http://code.google.com/p/libfreefare/source/detail?r=8290d3d8cc16

Modified:
/libfreefare/freefare.h
/libfreefare/freefare_internal.h
/libfreefare/mifare_desfire_key.c

=======================================
--- /libfreefare/freefare.h Wed Mar 19 16:04:14 2014 UTC
+++ /libfreefare/freefare.h Sun Apr 13 18:29:57 2014 UTC
@@ -389,14 +389,14 @@
int mifare_desfire_commit_transaction (MifareTag tag);
int mifare_desfire_abort_transaction (MifareTag tag);

-MifareDESFireKey mifare_desfire_des_key_new (uint8_t value[8]);
-MifareDESFireKey mifare_desfire_3des_key_new (uint8_t value[16]);
-MifareDESFireKey mifare_desfire_des_key_new_with_version (uint8_t
value[8]);
-MifareDESFireKey mifare_desfire_3des_key_new_with_version (uint8_t
value[16]);
-MifareDESFireKey mifare_desfire_3k3des_key_new (uint8_t value[24]);
-MifareDESFireKey mifare_desfire_3k3des_key_new_with_version (uint8_t
value[24]);
-MifareDESFireKey mifare_desfire_aes_key_new (uint8_t value[16]);
-MifareDESFireKey mifare_desfire_aes_key_new_with_version (uint8_t
value[16], uint8_t version);
+MifareDESFireKey mifare_desfire_des_key_new (const uint8_t value[8]);
+MifareDESFireKey mifare_desfire_3des_key_new (const uint8_t value[16]);
+MifareDESFireKey mifare_desfire_des_key_new_with_version (const uint8_t
value[8]);
+MifareDESFireKey mifare_desfire_3des_key_new_with_version (const uint8_t
value[16]);
+MifareDESFireKey mifare_desfire_3k3des_key_new (const uint8_t value[24]);
+MifareDESFireKey mifare_desfire_3k3des_key_new_with_version (const uint8_t
value[24]);
+MifareDESFireKey mifare_desfire_aes_key_new (const uint8_t value[16]);
+MifareDESFireKey mifare_desfire_aes_key_new_with_version (const uint8_t
value[16], uint8_t version);
uint8_t mifare_desfire_key_get_version (MifareDESFireKey key);
void mifare_desfire_key_set_version (MifareDESFireKey key, uint8_t
version);
void mifare_desfire_key_free (MifareDESFireKey key);
=======================================
--- /libfreefare/freefare_internal.h Sun Apr 13 17:57:49 2014 UTC
+++ /libfreefare/freefare_internal.h Sun Apr 13 18:29:57 2014 UTC
@@ -243,7 +243,7 @@
uint32_t selected_application;
};

-MifareDESFireKey mifare_desfire_session_key_new (uint8_t rnda[], uint8_t
rndb[], MifareDESFireKey authentication_key);
+MifareDESFireKey mifare_desfire_session_key_new (const uint8_t rnda[],
const uint8_t rndb[], MifareDESFireKey authentication_key);
const char *mifare_desfire_error_lookup (uint8_t error);

struct mifare_ultralight_tag {
=======================================
--- /libfreefare/mifare_desfire_key.c Sun Apr 13 17:57:49 2014 UTC
+++ /libfreefare/mifare_desfire_key.c Sun Apr 13 18:29:57 2014 UTC
@@ -38,7 +38,7 @@
}

MifareDESFireKey
-mifare_desfire_des_key_new (uint8_t value[8])
+mifare_desfire_des_key_new (const uint8_t value[8])
{
uint8_t data[8];
memcpy (data, value, 8);
@@ -48,7 +48,7 @@
}

MifareDESFireKey
-mifare_desfire_des_key_new_with_version (uint8_t value[8])
+mifare_desfire_des_key_new_with_version (const uint8_t value[8])
{
MifareDESFireKey key;

@@ -62,7 +62,7 @@
}

MifareDESFireKey
-mifare_desfire_3des_key_new (uint8_t value[16])
+mifare_desfire_3des_key_new (const uint8_t value[16])
{
uint8_t data[16];
memcpy (data, value, 16);
@@ -74,7 +74,7 @@
}

MifareDESFireKey
-mifare_desfire_3des_key_new_with_version (uint8_t value[16])
+mifare_desfire_3des_key_new_with_version (const uint8_t value[16])
{
MifareDESFireKey key;

@@ -87,7 +87,7 @@
}

MifareDESFireKey
-mifare_desfire_3k3des_key_new (uint8_t value[24])
+mifare_desfire_3k3des_key_new (const uint8_t value[24])
{
uint8_t data[24];
memcpy (data, value, 24);
@@ -97,7 +97,7 @@
}

MifareDESFireKey
-mifare_desfire_3k3des_key_new_with_version (uint8_t value[24])
+mifare_desfire_3k3des_key_new_with_version (const uint8_t value[24])
{
MifareDESFireKey key;

@@ -110,13 +110,13 @@
}

MifareDESFireKey
-mifare_desfire_aes_key_new (uint8_t value[16])
+mifare_desfire_aes_key_new (const uint8_t value[16])
{
return mifare_desfire_aes_key_new_with_version (value, 0);
}

MifareDESFireKey
-mifare_desfire_aes_key_new_with_version (uint8_t value[16], uint8_t
version)
+mifare_desfire_aes_key_new_with_version (const uint8_t value[16], uint8_t
version)
{
MifareDESFireKey key;

@@ -158,7 +158,7 @@
}

MifareDESFireKey
-mifare_desfire_session_key_new (uint8_t rnda[], uint8_t rndb[],
MifareDESFireKey authentication_key)
+mifare_desfire_session_key_new (const uint8_t rnda[], const uint8_t
rndb[], MifareDESFireKey authentication_key)
{
MifareDESFireKey key = NULL;

Reply all
Reply to author
Forward
0 new messages