1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-15 23:24:37 +03:00

38 Commits

Author SHA1 Message Date
Günther Deschner
6c8d802391 s3-libsmb: move smb encryption structs into own header.
Guenther
2011-03-16 10:11:16 +01:00
Simo Sorce
cdcdaaa6dd s3-ntlmssp: Remove ntlmssp_end and let the talloc hierarchy handle it.
All the members are children of ntlmssp_state anyway.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2010-07-19 14:19:47 +10:00
Andrew Bartlett
d6fa371b92 s3:ntlmssp Use a TALLOC_CTX for ntlmssp_sign_packet() and ntlmssp_seal_packet()
This ensures the results can't be easily left to leak.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-31 15:11:27 +02:00
Andrew Bartlett
ebae21f023 ntlmssp: Make the ntlmssp.h from source3/ a common header
The code is not yet in common, but I hope to fix that soon.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-31 15:10:56 +02:00
Andrew Bartlett
802e9328ed s3:ntlmssp: only include ntlmssp.h where actually needed
Andrew Bartlett
2009-12-22 21:07:53 +01:00
Andrew Bartlett
5b37cd23bf s3:ntlmssp: remove the typedef NTLMSSP_STATE
Andrew Bartlett
2009-12-22 21:07:53 +01:00
Volker Lendecke
c653e8daaf Fix two memleaks in the encryption code
ntlmssp_seal_packet creates its own signature data blob, which we then
have to free.

Jeremy, please check and merge appropriately (Yes, I'm asking you to do the
janitor work, I want you to *look* at this :-))

Volker
2009-03-24 22:00:10 +01:00
Volker Lendecke
ac4a77ccca Fix for crash bug freeing a non-malloc'ed buffer if the client sends a non-encrypted packet with the crypto state set. 2008-12-05 13:20:55 -08:00
Volker Lendecke
4b5169f590 Add explicit buf arg to cli_encrypt_message and cli_calculate_sign_mac
(This used to be commit db6ae9ed2326e6cd68475375d049084cf1d5a98c)
2008-02-28 13:12:34 +01:00
Jeremy Allison
9254bb4ef1 Refactor the crypto code after a very helpful conversation
with Volker. Mostly making sure we have data on the incoming
packet type, not stored in the smb header.
Jeremy.
(This used to be commit c4e5a505043965eec77b5bb9bc60957e8f3b97c8)
2008-01-04 12:56:23 -08:00
Jeremy Allison
afc93255d1 Add SMB encryption. Still fixing client decrypt but
negotiation works.
Jeremy.
(This used to be commit d78045601af787731f0737b8627450018902b104)
2007-12-26 17:12:36 -08:00
Gerald (Jerry) Carter
e5a951325a [GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.
(This used to be commit 5c6c8e1fe93f340005110a7833946191659d88ab)
2007-10-10 15:34:30 -05:00
Andrew Tridgell
5e54558c6d r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text
(This used to be commit b0132e94fc5fef936aa766fb99a306b3628e9f07)
2007-10-10 12:28:22 -05:00
Jeremy Allison
d824b98f80 r23779: Change from v2 or later to v3 or later.
Jeremy.
(This used to be commit 407e6e695b8366369b7c76af1ff76869b45347b3)
2007-10-10 12:28:20 -05:00
Volker Lendecke
7192160599 r22747: Fix some C++ warnings
(This used to be commit a66a04e9f11f6c4462f2b56b447bae4eca7b177c)
2007-10-10 12:21:54 -05:00
Jeremy Allison
0829e1ad1c r22391: Looks bigger than it is. Make "inbuf" available
to all callers of smb_setlen (via set_message()
calls). This will allow the server to reflect back
the correct encryption context.
Jeremy.
(This used to be commit 2d80a96120a5fe2fe726f00746d36d85044c4bdb)
2007-10-10 12:19:30 -05:00
Jeremy Allison
dc90cd89a7 r22389: Start preparing for multiple encryption contexts in the
server. Allow server to reflect back to calling client
the encryption context that was sent.
Jeremy.
(This used to be commit b49e90335d1e589916b5ab4992e3c4a2d221ca7e)
2007-10-10 12:19:30 -05:00
Jeremy Allison
5cee3be014 r22358: Use gss error to NTSTATUS mapping function for errors.
Jeremy.
(This used to be commit 11fa0ca9e21d478a4b79b8ca1e92936b26b03fe0)
2007-10-10 12:19:29 -05:00
Jeremy Allison
44ca85a506 r22016: Try and fix the build - move things out of proto.h
Jeremy.
(This used to be commit 29933600cff458f6599e4604f9e861cd20fc8e38)
2007-10-10 12:19:02 -05:00
Jeremy Allison
b0bcb48369 r22013: Move to SSPI framing (sig first in NTLM).
Jeremy
(This used to be commit 22eaed76f01ea9d0184dcaf57adca23abc6330b9)
2007-10-10 12:19:01 -05:00
Jeremy Allison
e9157961d6 r21997: Implement the server side of gss seal negotiate.
Jeremy.
(This used to be commit 6b923acfee59e39eea69e9e9a00f1f6118ed4270)
2007-10-10 12:18:58 -05:00
Jeremy Allison
3215c09a81 r21994: Ignore keepalives in the correct buffer (out not in :-).
Jeremy.
(This used to be commit 9785528ddf26c4943e8bdfcf7694314a52218520)
2007-10-10 12:18:58 -05:00
Jeremy Allison
4a66d0e232 r21991: I hate Steve French :-). Add support for encryption
contexts....
Jeremy.
(This used to be commit ae8f3649f773b8a8dcb55921536d038d3475322e)
2007-10-10 12:18:58 -05:00
Jeremy Allison
8b63654c2e r21969: Start working on the gss-side of the server negotiation.
Jeremy.
(This used to be commit fbc569b530104679e47fe743963eb0c4384de6ae)
2007-10-10 12:18:54 -05:00
Jeremy Allison
f93d75c932 r21926: Fix missing enum specifier pointed out by Don McCall @ HP.
Thanks Don !
Jeremy.
(This used to be commit 662344d1ec3593689de7602afa518ed98e10dc37)
2007-10-10 12:18:49 -05:00
Jeremy Allison
5a025d845a r21923: Add in the gss decrypt.
Jeremy.
(This used to be commit 00f58951b4cace06e51e7eb404605c7f3d366f38)
2007-10-10 12:18:49 -05:00
Jeremy Allison
8c395be5e5 r21922: Fixed the build by rather horrid means. I really need
to restructure libsmb/smb_signing.c so it isn't in
the base libs path but lives in libsmb instead (like
smb_seal.c does).
Jeremy.
(This used to be commit 1b828f051d0782201f697de15ff973bd6b097d5b)
2007-10-10 12:18:49 -05:00
Jeremy Allison
42238c78bb r21917: Start to do the gss versions of sign+seal.
Jeremy.
(This used to be commit a226645353a40047b72de1b96c3a7676a2bf1034)
2007-10-10 12:18:48 -05:00
Jeremy Allison
56c777882f r21916: Fix couple of "return" calls on void functions.
Ensure we ignore reqests to free keepalive buffers
as we only copied these.
Jeremy.
(This used to be commit a184bdbe3c7bf0c44a8141898bfcb9971a332312)
2007-10-10 12:18:48 -05:00
Jeremy Allison
d8bb69515b r21912: There's no point checksumming the packet length
this already has to be right. This makes the
signed+sealed area the same as it will be with
gss calls. Now to go implement them.
Jeremy.
(This used to be commit 80810af7d1137b3ddd3073581d5ec99fadaa81a5)
2007-10-10 12:18:48 -05:00
Jeremy Allison
6aff12a9f6 r21903: Get the length calculations right (I always forget
the 4 byte length isn't included in the length :-).
We now have working NTLMSSP transport encryption
with sign+seal. W00t!
Jeremy.
(This used to be commit d34584cb5c53c194693ce7236020ab83f60cd235)
2007-10-10 12:18:47 -05:00
Jeremy Allison
071db6fdbf r21897: Add in a basic raw NTLM encrypt request. Now
for testing.
Jeremy.
(This used to be commit 783a7b3085a155d9652cd725bf2960cd272cb554)
2007-10-10 12:18:46 -05:00
Jeremy Allison
6b0dcfa62d r21894: Some refactoring of server side encryption context. Support
"raw" NTLM auth (no spnego).
Jeremy.
(This used to be commit 6b5ff7bd591b4f65e2eb767928db50ddf445f09a)
2007-10-10 12:18:46 -05:00
Jeremy Allison
efbdda540a r21883: Try and fix the build by removing the prototypes for
functions that take a gss context handle in includes.h
Jeremy.
(This used to be commit 638b03242d4a6b1df2477dad19240ed61a14a5a3)
2007-10-10 12:18:43 -05:00
Jeremy Allison
296dcbac58 r21882: The server part of the code has to use an AUTH_NTLMSSP struct,
not just an NTLMSSP - grr. This complicates the re-use of
common client and server code but I think I've got it right.
Not turned on of valgrinded yet, but you can see it start
to take shape !
Jeremy.
(This used to be commit 60fc9c0aedf42dcd9df2ef9f1df07eaf3bca9bce)
2007-10-10 12:18:43 -05:00
Jeremy Allison
7ccf45684a r21880: Make client and server calls into encryption code symetrical,
depending on encryption context pointer.
Jeremy.
(This used to be commit d3f3ced6c8a03d971143baf878158d671dfcbc3b)
2007-10-10 12:18:43 -05:00
Jeremy Allison
c48b610b51 r21876: Start adding in the seal implementation - prototype code
for the server side enc. (doesn't break anything).
I'll keep updating this until I've got NTLM seal working
on both client and server, then add in the gss level
seal.
Jeremy.
(This used to be commit 530ac29abf23e920baa549e7cec55199edd8bd74)
2007-10-10 12:18:42 -05:00
Jeremy Allison
ecd496f066 r21865: Add in the stubs for SMB transport encryption. Will flesh
these out as I implement. Don't add to SAMBA_3_0_25, this
is experimental code.
NFSv4 you're now officially on notice... :-).
Jeremy.
(This used to be commit 5bfe638f2172e272741997100ee5ae8ff280494d)
2007-10-10 12:18:40 -05:00