[PATCH] Proposed merge of some NTLMSSP crypto

[Andrew Bartlett]

On Mon, 2009-12-21 at 08:17 +1100, Andrew Bartlett wrote:
> On Sat, 2009-12-19 at 11:32 +0100, Kai Blin wrote:
> > On Friday 11 December 2009 11:32:38 Andrew Bartlett wrote:
> > 
> > > To be clear, while I understand your suggestion, the next patch I do
> > > won't follow the steps you propose, but I'll mention here when it's
> > > done, and it can be accepted, rejected or reworked (Kai has offered to
> > > help on that) on it's merits at that time.
> > 
> > Ok, so after a solid 7 hours of watching code compile or fixing it if it 
> > doesn't compile,
> > 
> > http://gitweb.samba.org/?p=kai/samba/wip.git;a=shortlog;h=refs/heads/ntlmssp-
> > compile
> > 
> > (or the ntlmssp-compile branch in git://git.samba.org/kai/samba/wip.git) Has a 
> > patchset that at least compiles at every step. I'm not sure if the code 
> > actually works (as in passes make test), as that would have taken even longer.
> 
> From my reading of the branch, there are still quite a few patches that
> would need to be squashed to make this compile at each step - the
> changes to the challenge generation code in Samba4 is still split out
> over multiple patches, and some of the Samba4 callers are still fixed up
> after the API changes. 
> 
> But regardless, thankyou so much for your efforts to try and harmonise
> the patch stream, I do really appreciate it.  
> 
> My simple approach, given the change of approach mid-stream and the
> requirements stated for bisect-ability (from must merging the sign code,
> to merging the whole structure and server) would have been to produce 3
> patches of: 
>  - easily separable pre-work
>  - establish common API
>  - make Samba3 and Samba4 use common API

I've made some progress, I would very much appreciate any comments on
the substance of the following branches:

One approach I have is a bit merge: 
- A set of pre-work 
http://gitweb.samba.org/?p=abartlet/samba.git/.git;a=shortlog;h=refs/heads/ntlmssp-s3-prework

- The rest of the patch as one large patch (avoiding showing the
abandoned development direction). 
http://gitweb.samba.org/?p=abartlet/samba.git/.git;a=shortlog;h=refs/heads/ntlmssp-big-merge

I had hoped that this would allow GIT to realise that the new file is
derived from the existing ones, but despite efforts to harmonise the
changes to remove silly differences from the Samba3 and Samba4 version,
it has not been possible.t

I do realise the commit is *very* large, but I just can't see how to
sensibly break it up.  (The development process did not produce such a
sensible break)

The other approach is just to refine the existing branch:
http://gitweb.samba.org/?p=abartlet/samba.git/.git;a=shortlog;h=refs/heads/ntlmssp-wip2

And finally, to take Kai's branch and add my last patch to it, and
squash some things to merge 'fix ups' with the patch introducing the
error.  I did prepare this, but lost it in a rebase to obtain the
ntlmssp-big-merge branch. 

What I would really appreciate is a constructive review of the actual
patches, and proposals about practical ways this particular task can be
completed.

Thanks,

Andrew Bartlett

-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Samba Developer, Cisco Inc.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20091222/81cfc92c/attachment-0002.pgp>