mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 22:03:42 -07:00
data num now also properly pad hex converted to binary string operations 02 -> 00000010 -> 11111101 -> 01000000
This commit is contained in:
parent
8c04d9d0c8
commit
375b1439a1
1 changed files with 12 additions and 5 deletions
|
@ -3165,8 +3165,10 @@ static int CmdNumCon(const char *Cmd) {
|
|||
// only pad bin string
|
||||
int pn = 0;
|
||||
if (i == 2) {
|
||||
if (slen < blen) {
|
||||
if (blen && slen < blen) {
|
||||
pn = blen - slen + 1;
|
||||
} else if (hlen && (slen < (hlen * 4))) {
|
||||
pn = (hlen * 4) - slen + 1;
|
||||
}
|
||||
}
|
||||
PrintAndLogEx(SUCCESS, "%s%.*s%s",radix[i].desc, pn, pad, s);
|
||||
|
@ -3198,8 +3200,10 @@ static int CmdNumCon(const char *Cmd) {
|
|||
memset(scpy, 0x30, sizeof(scpy));
|
||||
int pn = 0;
|
||||
if (i == 2) {
|
||||
if (slen < blen) {
|
||||
if (blen && slen < blen) {
|
||||
pn = blen - slen + 1;
|
||||
} else if (hlen && (slen < (hlen * 4))) {
|
||||
pn = (hlen * 4) - slen + 1;
|
||||
}
|
||||
}
|
||||
memcpy(scpy + pn, s, slen);
|
||||
|
@ -3246,9 +3250,12 @@ static int CmdNumCon(const char *Cmd) {
|
|||
char scpy[600] = {0x30};
|
||||
memset(scpy, 0x30, sizeof(scpy));
|
||||
int pn = 0;
|
||||
if (slen < blen) {
|
||||
if (blen && slen < blen) {
|
||||
pn = blen - slen + 1;
|
||||
} else if (hlen && (slen < (hlen * 4))) {
|
||||
pn = (hlen * 4) - slen + 1;
|
||||
}
|
||||
|
||||
memcpy(scpy + pn, s, slen);
|
||||
str_inverse_bin(scpy, strlen(scpy));
|
||||
PrintAndLogEx(SUCCESS, "%s%s", radix[i].desc, scpy);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue