[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150712135329.GA2381@openwall.com>
Date: Sun, 12 Jul 2015 16:53:29 +0300
From: Solar Designer <solar@...nwall.com>
To: john-dev@...ts.openwall.com
Subject: Re: more robustness
Hi Kai,
On Sun, Jul 12, 2015 at 07:46:48PM +0800, Kai Zhao wrote:
> There are 4 bugs found by the latest --fuzz.
>
> https://github.com/loverszhaokai/JohnTheRipper/tree/fuzz_option
Somehow pulling this branch resulted in conflicts:
[solar@...er fuzz_option]$ git pull
Auto-merging run/fuzz_option.pl
CONFLICT (add/add): Merge conflict in run/fuzz_option.pl
Auto-merging src/bench.c
Removing src/dynamic_big_crypt.c
Auto-merging src/formats.c
Auto-merging src/formats.h
Auto-merging src/john.c
CONFLICT (content): Merge conflict in src/john.c
Auto-merging src/options.c
CONFLICT (content): Merge conflict in src/options.c
Auto-merging src/options.h
CONFLICT (content): Merge conflict in src/options.h
Automatic merge failed; fix conflicts and then commit the result.
Did you drop it and start over, or something?
Alexander
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
