Skip to content

Format selection: Add an "after" option #5901

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

Merged
magnumripper merged 1 commit into from
Nov 19, 2025
+41 −5
Merged

Format selection: Add an "after" option #5901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 32 additions & 4 deletions src/formats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,27 @@ static int exclude_formats(char *rej_format, struct fmt_main **full_fmt_list)
return removed;
}

/* Exclusions. Drop all format(s) up to and including the matching rej_format from full list */
static int exclude_formats_up_to(char *rej_format, struct fmt_main **full_fmt_list)
{
static int drop = 1;
struct fmt_main *current;
int removed = 0;

if ((current = *full_fmt_list))
do {
if (drop) {
if (fmt_match(rej_format, current, 1))
drop = 0;
*full_fmt_list = current->next;
removed++;
} else
break;
} while ((current = current->next));

return removed;
}

/* Inclusions. Move any format(s) matching req_format from full list to new list */
static int include_formats(char *req_format, struct fmt_main **full_fmt_list)
{
Expand Down Expand Up @@ -329,7 +350,7 @@ static void comma_split(struct list_main *dst, const char *src)

char* fmt_type(char *name)
{
if (name[1] && (name[0] == '+' || name[0] == '-'))
if (name[1] && (name[0] == '+' || name[0] == '-' || name[0] == '/'))
name++;

if (fmt_is_class(name))
Expand Down Expand Up @@ -357,9 +378,16 @@ int fmt_check_custom_list(void)
fmt_list = NULL;
fmt_tail = &fmt_list;

/* "-" Exclusions first, from the full list. */
/* "-" or "/" Exclusions first, from the full list. */
do {
if (req_format->data[0] == '-') {
if (req_format->data[0] == '/') {
char *exclude_fmt = &(req_format->data[1]);

if (!exclude_fmt[0])
error_msg("Error: '%s' in format list doesn't make sense\n", req_format->data);
num_e += exclude_formats_up_to(exclude_fmt, &full_fmt_list);
}
else if (req_format->data[0] == '-') {
char *exclude_fmt = &(req_format->data[1]);

if (!exclude_fmt[0])
Expand All @@ -371,7 +399,7 @@ int fmt_check_custom_list(void)
/* Inclusions. Move to the new list. */
req_format = req_formats->head;
do {
if ((req_format->data[0] != '-') && (req_format->data[0] != '+')) {
if ((req_format->data[0] != '-') && (req_format->data[0] != '+') && (req_format->data[0] != '/')) {
had_i = 1;
if (!include_formats(req_format->data, &full_fmt_list) && !is_in_fmt_list(req_format->data)) {
if (john_main_process)
Expand Down
10 changes: 9 additions & 1 deletion src/john.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,15 @@ static int exit_status = 0;
static void john_register_one(struct fmt_main *format)
{
if (options.format) {
if (options.format[0] == '-' && options.format[1]) {
if (options.format[0] == '/' && options.format[1]) {
static int drop = 1;

if (drop) {
if (fmt_match(&options.format[1], format, 1))
drop = 0;
return;
}
} else if (options.format[0] == '-' && options.format[1]) {
if (fmt_match(&options.format[1], format, 1))
return;
} else if (options.format[0] == '+' && options.format[1]) {
Expand Down