github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

client: fix mix of spaces & tabs

Browse source
This commit is contained in:
Philippe Teuwen 2019-03-09 23:35:06 +01:00
commit 0d9223a547
197 changed files with 49383 additions and 49383 deletions
Download patch file Download diff file Expand all files Collapse all files

56
client/amiitool/keygen.c
View file

@ -11,43 +11,43 @@
#include <string.h>
void nfc3d_keygen_prepare_seed(const nfc3d_keygen_masterkeys * baseKeys, const uint8_t * baseSeed, uint8_t * output, size_t * outputSize) {
assert(baseKeys != NULL);
assert(baseSeed != NULL);
assert(output != NULL);
assert(outputSize != NULL);
assert(baseKeys != NULL);
assert(baseSeed != NULL);
assert(output != NULL);
assert(outputSize != NULL);
uint8_t * start = output;
uint8_t * start = output;
// 1: Copy whole type string
output = memccpy(output, baseKeys->typeString, '\0', sizeof(baseKeys->typeString));
// 1: Copy whole type string
output = memccpy(output, baseKeys->typeString, '\0', sizeof(baseKeys->typeString));
// 2: Append (16 - magicBytesSize) from the input seed
size_t leadingSeedBytes = 16 - baseKeys->magicBytesSize;
memcpy(output, baseSeed, leadingSeedBytes);
output += leadingSeedBytes;
// 2: Append (16 - magicBytesSize) from the input seed
size_t leadingSeedBytes = 16 - baseKeys->magicBytesSize;
memcpy(output, baseSeed, leadingSeedBytes);
output += leadingSeedBytes;
// 3: Append all bytes from magicBytes
memcpy(output, baseKeys->magicBytes, baseKeys->magicBytesSize);
output += baseKeys->magicBytesSize;
// 3: Append all bytes from magicBytes
memcpy(output, baseKeys->magicBytes, baseKeys->magicBytesSize);
output += baseKeys->magicBytesSize;
// 4: Append bytes 0x10-0x1F from input seed
memcpy(output, baseSeed + 0x10, 16);
output += 16;
// 4: Append bytes 0x10-0x1F from input seed
memcpy(output, baseSeed + 0x10, 16);
output += 16;
// 5: Xor last bytes 0x20-0x3F of input seed with AES XOR pad and append them
unsigned int i;
for (i = 0; i < 32; i++) {
output[i] = baseSeed[i + 32] ^ baseKeys->xorPad[i];
}
output += 32;
// 5: Xor last bytes 0x20-0x3F of input seed with AES XOR pad and append them
unsigned int i;
for (i = 0; i < 32; i++) {
output[i] = baseSeed[i + 32] ^ baseKeys->xorPad[i];
}
output += 32;
*outputSize = output - start;
*outputSize = output - start;
}
void nfc3d_keygen(const nfc3d_keygen_masterkeys * baseKeys, const uint8_t * baseSeed, nfc3d_keygen_derivedkeys * derivedKeys) {
uint8_t preparedSeed[NFC3D_DRBG_MAX_SEED_SIZE];
size_t preparedSeedSize;
uint8_t preparedSeed[NFC3D_DRBG_MAX_SEED_SIZE];
size_t preparedSeedSize;
nfc3d_keygen_prepare_seed(baseKeys, baseSeed, preparedSeed, &preparedSeedSize);
nfc3d_drbg_generate_bytes(baseKeys->hmacKey, sizeof(baseKeys->hmacKey), preparedSeed, preparedSeedSize, (uint8_t *) derivedKeys, sizeof(*derivedKeys));
nfc3d_keygen_prepare_seed(baseKeys, baseSeed, preparedSeed, &preparedSeedSize);
nfc3d_drbg_generate_bytes(baseKeys->hmacKey, sizeof(baseKeys->hmacKey), preparedSeed, preparedSeedSize, (uint8_t *) derivedKeys, sizeof(*derivedKeys));
}