Fix #13937: add rahash2 -R radare2 sdb output

Keep -r output unchanged for backward compatibility (existing tests/scripts expect the current comment-like output). Add -R to emit r2 sdb commands (k file.<algo>=...) so hashes can be stored for any algorithm without relying on evars like file.sha1. Update manpage and add r2r tests.

Author: seifreed

libr/main/rahash2.c

@@ -118,7 +118,9 @@ static void do_hash_print(RHash *ctx, RahashOptions *ro, ut64 hash, int dlen, PJ
 	case 0:
 		if (!ro->quiet) {
 			printf ("0x%08" PFMT64x "-0x%08" PFMT64x " %s: ",
-				ro->from, ro->to > 0? ro->to - 1: 0, hname);
+				ro->from,
+				ro->to > 0? ro->to - 1: 0,
+				hname);
 		}
 		if (hash & R_HASH_SSDEEP) {
 			printf ("%s\n", ctx->digest);
@@ -132,6 +134,16 @@ static void do_hash_print(RHash *ctx, RahashOptions *ro, ut64 hash, int dlen, PJ
 		printf ("CC file %s:", hname);
 		do_hash_hexprint (c, dlen, ule, pj, rad);
 		break;
+	case 3:
+		printf ("k file.%s=", hname);
+		if (hash & R_HASH_SSDEEP) {
+			printf ("%s\n", ctx->digest);
+		} else if (dlen == R_HASH_SIZE_ENTROPY) {
+			printf ("%.8f\n", ctx->entropy);
+		} else {
+			do_hash_hexprint (c, dlen, ule, pj, 0);
+		}
+		break;
 	case 'n':
 		if (ro->quiet > 2) {
 			// print nothing
@@ -318,7 +330,7 @@ static int do_hash(RahashOptions *ro, const char *file, const char *algo, RIO *i
 }
 
 static int do_help(int line) {
-	printf ("Usage: rahash2 [-BehjkLqrvX] [-b S] [-a A] [-c H] [-E A] [-s S] [-f O] [-t O] [file] ...\n");
+	printf ("Usage: rahash2 [-BehjkLqRrvX] [-b S] [-a A] [-c H] [-E A] [-s S] [-f O] [-t O] [file] ...\n");
 	if (line) {
 		return 0;
 	}
@@ -341,6 +353,7 @@ static int do_help(int line) {
 		" -q          run in quiet mode (-qq to show only the hash)\n"
 		" -L          list muta plugins (combines with -q, used by -a, -E and -D)\n"
 		" -r          output radare commands\n"
+		" -R          output radare2 sdb commands (k file.<algo>=...)\n"
 		" -s string   hash this string instead of files\n"
 		" -t to       stop hashing at given address\n"
 		" -x hexstr   hash this hexpair string instead of files\n"
@@ -562,7 +575,7 @@ R_API int r_main_rahash2(int argc, const char **argv) {
 		goto beach; \
 	}
 	RGetopt opt;
-	r_getopt_init (&opt, argc, argv, "p:jJD:rveE:a:i:I:S:s:x:b:nBhf:t:kLqc:X");
+	r_getopt_init (&opt, argc, argv, "p:jJD:RrveE:a:i:I:S:s:x:b:nBhf:t:kLqc:X");
 	while ((c = r_getopt_next (&opt)) != -1) {
 		switch (c) {
 		case 'q':
@@ -603,6 +616,7 @@ R_API int r_main_rahash2(int argc, const char **argv) {
 			ro->endian = !ro->endian;
 			break;
 		case 'r': rad = 1; break;
+		case 'R': rad = 3; break;
 		case 'k': rad = 2; break;
 		case 'p': ptype = opt.arg; break;
 		case 'a': add_algo (algos, opt.arg); break;

man/rahash2.1

@@ -5,7 +5,7 @@
 .Nd Block-Based Hashing, Encoding, and Encryption Utility
 .Sh SYNOPSIS
 .Nm rahash2
-.Op Fl BehjkLqrvX
+.Op Fl BehjkLqRrvX
 .Op Fl b Ar S
 .Op Fl a Ar A
 .Op Fl c Ar H
@@ -60,7 +60,16 @@ Run in quiet mode (-qq to show only the hash)
 .It Fl L
 List muta plugins (combines with -q, used by -a, -E and -D)
 .It Fl r
-Output radare commands
+.No Output radare commands (comments), for example:
+.Bd -literal -offset indent
+$ rahash2 -a sha1 -r file | r2 -qni file
+.Ed
+.It Fl R
+.No Output radare2 sdb commands to store hashes under
+.No file.<algo> keys (works with any algorithm name), for example:
+.Bd -literal -offset indent
+$ rahash2 -a sha1 -R file | r2 -qni file
+.Ed
 .It Fl s Ar string
 Hash this string instead of files
 .It Fl t Ar to
@@ -132,4 +141,4 @@ When using the -c flag, an exit status of 0 indicates a match between the expect
 .Xr radare2(1)
 .Sh AUTHORS
 .Pp
-pancake <pancake@nopcode.org>
+pancake <pancake@nopcode.org>

test/db/tools/rahash2

@@ -74,11 +74,21 @@ bins/elf/analysis/hello-linux-x86_64: CC file sha256:7bdbf25324af1946ec0b16dbf92
 EOF
 RUN
 
+NAME=rahash2 -a md5,sha1,sha256 -R
+FILE=-
+CMDS=!rahash2 -a md5,sha1,sha256 -R bins/elf/analysis/hello-linux-x86_64
+EXPECT=<<EOF
+bins/elf/analysis/hello-linux-x86_64: k file.md5=c957bd5bd6204470256bc15248ccafd4
+bins/elf/analysis/hello-linux-x86_64: k file.sha1=687c82d13cb27f0600d8e57edc784282c1732f56
+bins/elf/analysis/hello-linux-x86_64: k file.sha256=7bdbf25324af1946ec0b16dbf928875a588a786f7c279cd115729c5a3a297a55
+EOF
+RUN
+
 NAME=rahash2 -h
 FILE=-
 CMDS=!rahash2~Usage
 EXPECT=<<EOF
-Usage: rahash2 [-BehjkLqrvX] [-b S] [-a A] [-c H] [-E A] [-s S] [-f O] [-t O] [file] ...
+Usage: rahash2 [-BehjkLqRrvX] [-b S] [-a A] [-c H] [-E A] [-s S] [-f O] [-t O] [file] ...
 EOF
 RUN