RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 23:36:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix compiler warning on arm-none-eabi 11.1.0

Browse source
This commit is contained in:
iceman1001 2021-05-13 13:28:03 +02:00
parent 19a2ce4cb3
commit 3b7153045f
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
armsrc/lfops.c
View file

@ -227,40 +227,47 @@ void printT55xxConfig(void) {
break; break;
} }
if (T55xx_Timing.m[i].start_gap != 0xFFFF) if (T55xx_Timing.m[i].start_gap != 0xFFFF) {
sprintf(s + strlen(s), " %3d | ", T55xx_Timing.m[i].start_gap / 8); sprintf(s + strlen(s), " %3d | ", T55xx_Timing.m[i].start_gap / 8);
else } else {
PRN_NA; PRN_NA;
}
if (T55xx_Timing.m[i].write_gap != 0xFFFF) if (T55xx_Timing.m[i].write_gap != 0xFFFF) {
sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_gap / 8); sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_gap / 8);
else } else {
PRN_NA; PRN_NA;
}
if (T55xx_Timing.m[i].write_0 != 0xFFFF) if (T55xx_Timing.m[i].write_0 != 0xFFFF) {
sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_0 / 8); sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_0 / 8);
else } else {
PRN_NA; PRN_NA;
}
if (T55xx_Timing.m[i].write_1 != 0xFFFF) if (T55xx_Timing.m[i].write_1 != 0xFFFF) {
sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_1 / 8); sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_1 / 8);
else } else {
PRN_NA; PRN_NA;
}
if (T55xx_Timing.m[i].read_gap != 0xFFFF) if (T55xx_Timing.m[i].read_gap != 0xFFFF) {
sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].read_gap / 8); sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].read_gap / 8);
else } else {
PRN_NA; PRN_NA;
}
if (T55xx_Timing.m[i].write_2 != 0xFFFF && i == T55XX_DLMODE_1OF4) if (T55xx_Timing.m[i].write_2 != 0xFFFF && i == T55XX_DLMODE_1OF4) {
sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_2 / 8); sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_2 / 8);
else } else {
PRN_NA PRN_NA
}
if (T55xx_Timing.m[i].write_3 != 0xFFFF && i == T55XX_DLMODE_1OF4) if (T55xx_Timing.m[i].write_3 != 0xFFFF && i == T55XX_DLMODE_1OF4) {
sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_3 / 8); sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_3 / 8);
else } else {
PRN_NA; PRN_NA;
}
// remove last space // remove last space
s[strlen(s)] = 0; s[strlen(s)] = 0;

2
armsrc/optimized_ikeys.h
View file

@ -59,7 +59,7 @@ void hash0(uint64_t c, uint8_t k[8]);
* @param div_key * @param div_key
*/ */
void diversifyKey(uint8_t *csn, *uint8_t key, uint8_t *div_key); void diversifyKey(uint8_t *csn, uint8_t *key, uint8_t *div_key);
/** /**
* @brief Permutes a key from standard NIST format to Iclass specific format * @brief Permutes a key from standard NIST format to Iclass specific format
* @param key * @param key