Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add MS-DOS and Win32 Timestamp Conversion to rz-ax #4526

Merged
merged 4 commits into from
Jun 2, 2024
Merged

Add MS-DOS and Win32 Timestamp Conversion to rz-ax #4526

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed2b60a
Added MS-DOS timestamp functionality to rz-ax
TheN00bBuilder Jun 1, 2024
67f903a
Reran clang-format with correct version
TheN00bBuilder Jun 2, 2024
ca0492e
Moved list free
TheN00bBuilder Jun 2, 2024
4c88814
Added Win32 command to rz-ax
TheN00bBuilder Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 50 additions & 33 deletions librz/main/rz-ax.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,35 @@
#include <rz_util.h>
#include <rz_util/rz_print.h>

#define RZ_AX_FLAG_HEX_TO_RAW (1ull << 0) // -s (hexstr -> raw)
#define RZ_AX_FLAG_SWAP_ENDIANNESS (1ull << 1) // -e (swap endianness)
#define RZ_AX_FLAG_RAW_TO_HEX (1ull << 2) // -S (raw -> hexstr)
#define RZ_AX_FLAG_BIN_TO_STR (1ull << 3) // -b (bin -> str)
#define RZ_AX_FLAG_STR_TO_DJB2 (1ull << 4) // -x (str -> djb2 hash)
#define RZ_AX_FLAG_KEEP_BASE (1ull << 5) // -k (keep base)
#define RZ_AX_FLAG_FLOATING_POINT (1ull << 6) // -f (floating point)
#define RZ_AX_FLAG_FORCE_INTEGER (1ull << 7) // -d (force integer)
#define RZ_AX_FLAG_NUMBER_TO_HEX (1ull << 9) // -n (num -> hex)
#define RZ_AX_FLAG_UNITS (1ull << 10) // -u (units)
#define RZ_AX_FLAG_TIMESTAMP_TO_STR (1ull << 11) // -t (timestamp -> str)
#define RZ_AX_FLAG_BASE64_ENCODE (1ull << 12) // -E (base64 encode)
#define RZ_AX_FLAG_BASE64_DECODE (1ull << 13) // -D (base64 decode)
#define RZ_AX_FLAG_RAW_TO_LANGBYTES (1ull << 14) // -F (raw -> C or JS or Python bytes)
#define RZ_AX_FLAG_NUMBER_TO_HEXSTR (1ull << 15) // -N (num -> escaped hex string)
#define RZ_AX_FLAG_SIGNED_WORD (1ull << 16) // -w (signed word)
#define RZ_AX_FLAG_STR_TO_BIN (1ull << 17) // -B (str -> bin)
#define RZ_AX_FLAG_RIZIN_CMD (1ull << 18) // -r (rizin commands)
#define RZ_AX_FLAG_BIN_TO_BIGNUM (1ull << 19) // -L (bin -> hex(bignum))
#define RZ_AX_FLAG_DUMP_C_BYTES (1ull << 21) // -i (dump as C byte array)
#define RZ_AX_FLAG_OCTAL_TO_RAW (1ull << 22) // -o (octalstr -> raw)
#define RZ_AX_FLAG_IPADDR_TO_LONG (1ull << 23) // -I (IP address <-> LONG)
#define RZ_AX_FLAG_SET_BITS (1ull << 24) // -p (find position of set bits)

#define has_flag(f, x) (f & x)
#define RZ_AX_FLAG_HEX_TO_RAW (1ull << 0) // -s (hexstr -> raw)
#define RZ_AX_FLAG_SWAP_ENDIANNESS (1ull << 1) // -e (swap endianness)
#define RZ_AX_FLAG_RAW_TO_HEX (1ull << 2) // -S (raw -> hexstr)
#define RZ_AX_FLAG_BIN_TO_STR (1ull << 3) // -b (bin -> str)
#define RZ_AX_FLAG_STR_TO_DJB2 (1ull << 4) // -x (str -> djb2 hash)
#define RZ_AX_FLAG_KEEP_BASE (1ull << 5) // -k (keep base)
#define RZ_AX_FLAG_FLOATING_POINT (1ull << 6) // -f (floating point)
#define RZ_AX_FLAG_FORCE_INTEGER (1ull << 7) // -d (force integer)
#define RZ_AX_FLAG_NUMBER_TO_HEX (1ull << 9) // -n (num -> hex)
#define RZ_AX_FLAG_UNITS (1ull << 10) // -u (units)
#define RZ_AX_FLAG_TIMESTAMP_TO_STR (1ull << 11) // -t (unix timestamp -> str)
#define RZ_AX_FLAG_BASE64_ENCODE (1ull << 12) // -E (base64 encode)
#define RZ_AX_FLAG_BASE64_DECODE (1ull << 13) // -D (base64 decode)
#define RZ_AX_FLAG_RAW_TO_LANGBYTES (1ull << 14) // -F (raw -> C or JS or Python bytes)
#define RZ_AX_FLAG_NUMBER_TO_HEXSTR (1ull << 15) // -N (num -> escaped hex string)
#define RZ_AX_FLAG_SIGNED_WORD (1ull << 16) // -w (signed word)
#define RZ_AX_FLAG_STR_TO_BIN (1ull << 17) // -B (str -> bin)
#define RZ_AX_FLAG_RIZIN_CMD (1ull << 18) // -r (rizin commands)
#define RZ_AX_FLAG_BIN_TO_BIGNUM (1ull << 19) // -L (bin -> hex(bignum))
#define RZ_AX_FLAG_DUMP_C_BYTES (1ull << 21) // -i (dump as C byte array)
#define RZ_AX_FLAG_OCTAL_TO_RAW (1ull << 22) // -o (octalstr -> raw)
#define RZ_AX_FLAG_IPADDR_TO_LONG (1ull << 23) // -I (IP address <-> LONG)
#define RZ_AX_FLAG_SET_BITS (1ull << 24) // -p (find position of set bits)
#define RZ_AX_FLAG_DOS_TIMESTAMP_TO_STR (1ull << 25) // -m (MS-DOS timestamp -> str)
#define RZ_AX_FLAG_WIN_TIMESTAMP_TO_STR (1ull << 26) // -W (Win32 timestamp -> str)

#define has_flag(f, x) (f & x)
#define is_timestamp(f) ((f & RZ_AX_FLAG_DOS_TIMESTAMP_TO_STR) || \
(f & RZ_AX_FLAG_TIMESTAMP_TO_STR) || (f & RZ_AX_FLAG_WIN_TIMESTAMP_TO_STR))
// don't use fixed sized buffers
#define STDIN_BUFFER_SIZE 354096
static int rax(RzNum *num, char *str, int len, int last, ut64 *flags, int *fm);
Expand Down Expand Up @@ -226,7 +229,9 @@ static int help(void) {
" -r rz style output ; rz-ax -r 0x1234\n"
" -s hexstr -> raw ; rz-ax -s 43 4a 50\n"
" -S raw -> hexstr ; rz-ax -S < /bin/ls > ls.hex\n"
" -t tstamp -> str ; rz-ax -t 1234567890\n"
" -t Unix tstamp -> str ; rz-ax -t 1234567890\n"
" -m MS-DOS tstamp -> str ; rz-ax -m 1234567890\n"
" -W Win32 tstamp -> str ; rz-ax -W 1234567890\n"
" -x hash string ; rz-ax -x linux osx\n"
" -u units ; rz-ax -u 389289238 # 317.0M\n"
" -w signed word ; rz-ax -w 16 0xffff\n"
Expand Down Expand Up @@ -289,6 +294,8 @@ static int rax(RzNum *num, char *str, int len, int last, ut64 *_flags, int *fm)
case 'i': flags ^= RZ_AX_FLAG_DUMP_C_BYTES; break;
case 'o': flags ^= RZ_AX_FLAG_OCTAL_TO_RAW; break;
case 'I': flags ^= RZ_AX_FLAG_IPADDR_TO_LONG; break;
case 'm': flags ^= RZ_AX_FLAG_DOS_TIMESTAMP_TO_STR; break;
case 'W': flags ^= RZ_AX_FLAG_WIN_TIMESTAMP_TO_STR; break;
case 'v': return rz_main_version_print("rz-ax");
case '\0':
*_flags = flags;
Expand Down Expand Up @@ -495,23 +502,33 @@ static int rax(RzNum *num, char *str, int len, int last, ut64 *_flags, int *fm)
rz_num_units(buf, sizeof(buf), rz_num_math(NULL, str));
printf("%s\n", buf);
return true;
} else if (has_flag(flags, RZ_AX_FLAG_TIMESTAMP_TO_STR)) { // -t
} else if (is_timestamp(flags)) { // -t, -m, -W
RzList *split = rz_str_split_list(str, "GMT", 0);
RzListIter *head = rz_list_head(split);
char *ts = rz_list_iter_get_data(head);
const char *gmt = rz_list_iter_get_next_data(head);
if (gmt && strlen(gmt) < 2) {
gmt = NULL;
}
ut32 n = rz_num_math(num, ts);
ut64 n = rz_num_math(num, ts);
int timezone = (int)rz_num_math(num, gmt);
n += timezone * (60 * 60);
char *date = rz_time_date_unix_to_string(n);
printf("%s\n", date);
fflush(stdout);
free(date);
char *date = NULL;
if (has_flag(flags, RZ_AX_FLAG_TIMESTAMP_TO_STR)) {
date = rz_time_date_unix_to_string((ut32)n);
} else if (has_flag(flags, RZ_AX_FLAG_DOS_TIMESTAMP_TO_STR)) {
date = rz_time_date_dos_to_string((ut32)n);
} else {
date = rz_time_date_w32_to_string(n);
}
rz_list_free(split);
return true;
if (date != NULL) {
printf("%s\n", date);
fflush(stdout);
free(date);
return true;
}
return false;
} else if (has_flag(flags, RZ_AX_FLAG_BASE64_ENCODE)) { // -E
const int n = strlen(str);
/* http://stackoverflow.com/questions/4715415/base64-what-is-the-worst-possible-increase-in-space-usage */
Expand Down
Loading