[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CABob6ipp-A+VAGV=+oTHsPP_+Q8BziMT1KXqnekBcMwk+f-tMA@mail.gmail.com>
Date: Sat, 19 May 2012 01:07:48 +0200
From: Lukas Odzioba <lukas.odzioba@...il.com>
To: john-dev@...ts.openwall.com
Subject: Re: Cherry-picking from Lukas' repo
2012/5/18 magnum <john.magnum@...hmail.com>:
> Lukas,
>
> I tried to cherry-pick a couple of commits from your repo (9892786,
> 72eb631 and 0b447b6 - should I pick the newer too?) in order to get
> working cryptmd5 and phpass etc. but the commits does not apply cleanly.
> This is because I had Solar's patch from
> http://www.openwall.com/lists/john-dev/2012/05/01/19 in there already.
>
> Does your current version of wpapsk.h superseed that patch? Or should I
> hand-edit it, keeping Solar's changes?
Stay calm i'll prepare proper (my current repo state + new things)
code based on your current and let you know at Sunday.
It will commit cleanly.
All best,
Lukas
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.
