Merge master to features/yara.

This commit is contained in:
Steven Morgan 2015-05-01 18:36:48 -04:00
commit a80453e6e9
66 changed files with 3142 additions and 1048 deletions

View file

@ -2970,7 +2970,13 @@ void cli_bytecode_describe(const struct cli_bc *bc)
puts("logical only");
break;
case BC_PE_UNPACKER:
puts("PE hook");
puts("PE unpacker hook");
break;
case BC_PE_ALL:
puts("all PE hook");
break;
case BC_PRECLASS:
puts("preclass hook");
break;
default:
printf("Unknown (type %u)", bc->kind);
@ -3007,6 +3013,12 @@ void cli_bytecode_describe(const struct cli_bc *bc)
else
puts("all PE files!");
break;
case BC_PRECLASS:
if (bc->lsig)
puts("PRECLASS files matching logical signature");
else
puts("all PRECLASS files!");
break;
default:
puts("N/A (unknown type)\n");
break;