changed "data num" to accept -r -i parameters where it will reverse or inverse the values.\nrenamed some util functions

This commit is contained in:
iceman1001 committed 2023-12-07 16:44:31 +01:00
1 parent 7c749267e6
commit 97e2d7f026
13 files changed
+149 -51

No files matched your search

+46 -7
View File
@@ -276,7 +276,7 @@ int printDemodBuff(uint8_t offset, bool strip_leading, bool invert, bool print_h
if (print_hex) {
p = (buf + offset);
char hex[MAX_DEMODULATION_BITS + 1] = {0x00};
int num_bits = binarraytohex(hex, sizeof(hex), (char *)p, len);
int num_bits = binarray_2_hex(hex, sizeof(hex), (char *)p, len);
if (num_bits == 0) {
p = NULL;
free(buf);
@@ -3281,6 +3281,7 @@ static int CmdNumCon(const char *Cmd) {
arg_str0(NULL, "hex", "<hex>", "hexadecimal value"),
arg_str0(NULL, "bin", "<bin>", "binary value"),
arg_lit0("i", NULL, "print inverted value"),
arg_lit0("r", NULL, "print reversed value"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, false);
@@ -3302,6 +3303,7 @@ static int CmdNumCon(const char *Cmd) {
res |= CLIParamStrToBuf(arg_get_str(ctx, 3), (uint8_t *)bin, sizeof(bin), &blen);
bool shall_invert = arg_get_lit(ctx, 4);
bool shall_reverse = arg_get_lit(ctx, 5);
CLIParserFree(ctx);
// sanity checks
@@ -3343,11 +3345,6 @@ static int CmdNumCon(const char *Cmd) {
mbedtls_mpi_init(&base);
mbedtls_mpi_add_int(&base, &base, 10);
if (shall_invert) {
PrintAndLogEx(INFO, "should invert");
MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(&N, &N, &base));
}
// printing
typedef struct {
const char *desc;
@@ -3365,11 +3362,53 @@ static int CmdNumCon(const char *Cmd) {
for (uint8_t i = 0; i < ARRAYLEN(radix); i++) {
MBEDTLS_MPI_CHK(mbedtls_mpi_write_string(&N, radix[i].radix, s, sizeof(s), &slen));
if (slen > 0) {
if (slen) {
PrintAndLogEx(SUCCESS, "%s%s", radix[i].desc, s);
}
}
// reverse
if (shall_reverse) {
PrintAndLogEx(SUCCESS, _CYAN_("Reversed"));
for (uint8_t i = 0; i < ARRAYLEN(radix); i++) {
MBEDTLS_MPI_CHK(mbedtls_mpi_write_string(&N, radix[i].radix, s, sizeof(s), &slen));
str_reverse(s, strlen(s));
if (slen) {
PrintAndLogEx(SUCCESS, "%s%s", radix[i].desc, s);
}
}
}
// invert
if (shall_invert) {
PrintAndLogEx(SUCCESS, _CYAN_("Inverted"));
for (uint8_t i = 0; i < ARRAYLEN(radix); i++) {
MBEDTLS_MPI_CHK(mbedtls_mpi_write_string(&N, radix[i].radix, s, sizeof(s), &slen));
if (slen == 0) {
continue;
}
switch(i) {
case 0:
// MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(&N, &N, &base));
break;
case 1:
str_inverse_hex(s, strlen(s));
PrintAndLogEx(SUCCESS, "%s%s", radix[i].desc, s);
break;
case 2:
str_inverse_bin(s, strlen(s));
PrintAndLogEx(SUCCESS, "%s%s", radix[i].desc, s);
break;
default:
break;
}
}
}
// check if number is a prime
mbedtls_entropy_context entropy;
mbedtls_ctr_drbg_context ctr_drbg;
+2 -2
View File
@@ -1349,7 +1349,7 @@ static int iclass_decode_credentials_new_pacs(uint8_t *d) {
}
uint8_t n = PICOPASS_BLOCK_SIZE - offset - 2;
byte_2_binstr(binstr, d + offset + 2, n);
bytes_2_binstr(binstr, d + offset + 2, n);
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "PACS......... " _GREEN_("%s"), sprint_hex_inrow(d + offset + 2, n));
@@ -4562,7 +4562,7 @@ static int CmdHFiClassSAM(const char *Cmd) {
return PM3_EMALLOC;
}
byte_2_binstr(binstr, d + 3, n);
bytes_2_binstr(binstr, d + 3, n);
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "PACS......... " _GREEN_("%s"), sprint_hex_inrow(d + 2, resp.length - 2));
+1 -1
View File
@@ -1677,7 +1677,7 @@ static int CmdT55xxDangerousRaw(const char *Cmd) {
return PM3_EINVARG;
}
int bs_len = binstring2binarray(ng.data, (char *)bin, bin_len);
int bs_len = binstr_2_binarray(ng.data, (char *)bin, bin_len);
if (bs_len == 0) {
return PM3_EINVARG;
}
+4 -4
View File
@@ -986,7 +986,7 @@ int loadFileEML_safe(const char *preferredName, void **pdata, size_t *datalen) {
if (line[0] == '#')
continue;
strcleanrn(line, sizeof(line));
str_cleanrn(line, sizeof(line));
res = param_gethex_to_eol(line, 0, buf, sizeof(buf), &hexlen);
if (res == 0) {
@@ -1059,7 +1059,7 @@ int loadFileNFC_safe(const char *preferredName, void *data, size_t maxdatalen, s
if (line[0] == '#')
continue;
strcleanrn(line, sizeof(line));
str_cleanrn(line, sizeof(line));
str_lower(line);
if (str_startswith(line, "uid:")) {
@@ -1306,7 +1306,7 @@ int loadFileMCT_safe(const char *preferredName, void **pdata, size_t *datalen) {
if (line[0] == '+')
continue;
strcleanrn(line, sizeof(line));
str_cleanrn(line, sizeof(line));
res = param_gethex_to_eol(line, 0, buf, sizeof(buf), &hexlen);
if (res == 0) {
@@ -2261,7 +2261,7 @@ nfc_df_e detect_nfc_dump_format(const char *preferredName, bool verbose) {
return PM3_EFILE;
}
strcleanrn(line, sizeof(line));
str_cleanrn(line, sizeof(line));
str_lower(line);
if (str_startswith(line, "device type: ntag")) {
+1 -1
View File
@@ -63,7 +63,7 @@ void push6bits(BitstreamOut_t *stream, uint8_t bits);
void EncryptDES(bool key[56], bool outBlk[64], bool inBlk[64], int verbose) ;
void x_num_to_bytes(uint64_t n, size_t len, uint8_t *dest);
uint64_t x_bytes_to_num(uint8_t *src, size_t len);
uint8_t reversebytes(uint8_t b);
uint8_t reversebyte(uint8_t b);
void reverse_arraybytes(uint8_t *arr, size_t len);
void reverse_arraycopy(uint8_t *arr, uint8_t *dest, size_t len);
void printarr(const char *name, uint8_t *arr, int len);
+6 -6
View File
@@ -223,7 +223,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) {
uint16_t script_cmd_len = 0;
if (execCommand) {
script_cmd_len = strlen(script_cmd);
strcreplace(script_cmd, script_cmd_len, ';', '\0');
str_creplace(script_cmd, script_cmd_len, ';', '\0');
}
bool stdinOnPipe = !isatty(STDIN_FILENO);
char script_cmd_buf[256] = {0x00}; // iceman, needs lua script the same file_path_buffer as the rest
@@ -312,7 +312,7 @@ check_script:
prompt_ctx = PROXPROMPT_CTX_SCRIPTFILE;
// remove linebreaks
strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
str_cleanrn(script_cmd_buf, sizeof(script_cmd_buf));
cmd = str_dup(script_cmd_buf);
if (cmd != NULL) {
@@ -354,9 +354,9 @@ check_script:
fromInteractive = false;
script_cmd = script_cmd_buf;
script_cmd_len = strlen(script_cmd);
strcreplace(script_cmd, script_cmd_len, ';', '\0');
str_creplace(script_cmd, script_cmd_len, ';', '\0');
// remove linebreaks
strcleanrn(script_cmd, script_cmd_len);
str_cleanrn(script_cmd, script_cmd_len);
goto check_script;
} else {
pm3line_check(check_comm);
@@ -376,9 +376,9 @@ check_script:
stayInCommandLoop = true;
fromInteractive = true;
script_cmd_len = strlen(script_cmd);
strcreplace(script_cmd, script_cmd_len, ';', '\0');
str_creplace(script_cmd, script_cmd_len, ';', '\0');
// remove linebreaks
strcleanrn(script_cmd, script_cmd_len);
str_cleanrn(script_cmd, script_cmd_len);
goto check_script;
}
fflush(NULL);
+61 -9
View File
@@ -92,6 +92,30 @@ int kbd_enter_pressed(void) {
}
#endif
static char inv_b2s(char v, bool uppercase) {
if (isxdigit(v) == 0) {
return '.';
}
uint8_t lut[] = {
'f', 'e', 'd', 'c',
'b', 'a', '9', '8',
'7', '6', '5', '4',
'3', '2', '1', '0'
};
uint8_t tmp = (tolower(v) - 'a' + 10);
if (isdigit(v)) {
tmp = (v - 0x30);
}
if (uppercase)
return toupper(lut[tmp]);
else
return lut[tmp];
}
static char b2s(uint8_t v, bool uppercase) {
// clear higher bits
v &= 0xF;
@@ -938,12 +962,12 @@ int hextobinstring_n(char *target, char *source, int sourcelen) {
if (length == 0) {
return 0;
}
binarraytobinstring(target, target, length);
binarray_2_binstr(target, target, length);
return length;
}
// convert bytes to binary string
void byte_2_binstr(char *target, const uint8_t *source, size_t sourcelen) {
void bytes_2_binstr(char *target, const uint8_t *source, size_t sourcelen) {
//uint8_t *p = *source;
for (int i = 0 ; i < sourcelen; ++i) {
uint8_t b = *(source++);
@@ -961,7 +985,7 @@ void byte_2_binstr(char *target, const uint8_t *source, size_t sourcelen) {
// convert binary array of 0x00/0x01 values to hex
// return number of bits converted
int binarraytohex(char *target, const size_t targetlen, const char *source, size_t srclen) {
int binarray_2_hex(char *target, const size_t targetlen, const char *source, size_t srclen) {
uint8_t i = 0, x = 0;
uint32_t t = 0; // written target chars
uint32_t r = 0; // consumed bits
@@ -1007,14 +1031,14 @@ int binarraytohex(char *target, const size_t targetlen, const char *source, size
}
// convert binary array to human readable binary
void binarraytobinstring(char *target, char *source, int length) {
void binarray_2_binstr(char *target, char *source, int length) {
for (int i = 0 ; i < length; ++i) {
*(target++) = *(source++) + '0';
}
*target = '\0';
}
int binstring2binarray(uint8_t *target, char *source, int length) {
int binstr_2_binarray(uint8_t *target, char *source, int length) {
int count = 0;
char *start = source;
while (length--) {
@@ -1171,13 +1195,13 @@ void clean_ascii(unsigned char *buf, size_t len) {
}
// replace \r \n to \0
void strcleanrn(char *buf, size_t len) {
strcreplace(buf, len, '\n', '\0');
strcreplace(buf, len, '\r', '\0');
void str_cleanrn(char *buf, size_t len) {
str_creplace(buf, len, '\n', '\0');
str_creplace(buf, len, '\r', '\0');
}
// replace char in buffer
void strcreplace(char *buf, size_t len, char from, char to) {
void str_creplace(char *buf, size_t len, char from, char to) {
for (size_t i = 0; i < len; i++) {
if (buf[i] == from)
buf[i] = to;
@@ -1208,6 +1232,34 @@ size_t str_nlen(const char *src, size_t maxlen) {
return len;
}
void str_reverse(char *buf, size_t len) {
for (size_t i = 0; i < (len>>1); i++) {
char tmp = buf[i];
buf[i] = buf[len - i - 1];
buf[len - i - 1] = tmp;
}
}
void str_inverse_hex(char *buf, size_t len) {
for (size_t i = 0; i < len; i++) {
buf[i] = inv_b2s(buf[i], true);
}
}
void str_inverse_bin(char *buf, size_t len) {
for (size_t i = 0; i < len; i++) {
char c = buf[i];
if (c == '1')
buf[i] = '0';
else if ( c == '0')
buf[i] = '1';
else
buf[i] = '.';
}
}
/**
* Converts a hex string to component "hi2", "hi" and "lo" 32-bit integers
* one nibble at a time.
+10 -6
View File
@@ -117,11 +117,11 @@ int hextobinarray_n(char *target, char *source, int sourcelen);
int hextobinstring(char *target, char *source);
int hextobinstring_n(char *target, char *source, int sourcelen);
int binarraytohex(char *target, const size_t targetlen, const char *source, size_t srclen);
void binarraytobinstring(char *target, char *source, int length);
int binstring2binarray(uint8_t *target, char *source, int length);
int binarray_2_hex(char *target, const size_t targetlen, const char *source, size_t srclen);
void binarray_2_binstr(char *target, char *source, int length);
int binstr_2_binarray(uint8_t *target, char *source, int length);
void byte_2_binstr(char *target, const uint8_t *source, size_t sourcelen);
void bytes_2_binstr(char *target, const uint8_t *source, size_t sourcelen);
void binstr_2_bytes(uint8_t *target, size_t *targetlen, const char *src);
uint8_t GetParity(const uint8_t *bits, uint8_t type, int length);
@@ -143,8 +143,12 @@ void strn_upper(char *s, size_t n);
bool str_startswith(const char *s, const char *pre); // check for prefix in string
bool str_endswith(const char *s, const char *suffix); // check for suffix in string
void clean_ascii(unsigned char *buf, size_t len);
void strcleanrn(char *buf, size_t len);
void strcreplace(char *buf, size_t len, char from, char to);
void str_cleanrn(char *buf, size_t len);
void str_creplace(char *buf, size_t len, char from, char to);
void str_reverse(char *buf, size_t len);
void str_inverse_hex(char *buf, size_t len);
void str_inverse_bin(char *buf, size_t len);
char *str_dup(const char *src);
char *str_ndup(const char *src, size_t len);
size_t str_nlen(const char *src, size_t maxlen);