Openwall GNU/*/Linux - a small security-enhanced Linux distro for servers
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sun, 12 Jul 2015 16:53:29 +0300
From: Solar Designer <>
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.

Somehow pulling this branch resulted in conflicts:

[ fuzz_option]$ git pull
Auto-merging run/
CONFLICT (add/add): Merge conflict in run/
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?


Powered by blists - more mailing lists

Your e-mail address:

Powered by Openwall GNU/*/Linux - Powered by OpenVZ