Print this page
NEX-16824 SMB client connection setup rework
NEX-17232 SMB client reconnect failures
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
and: (improve debug)
SUP-513 Unable to join AD domain (with NtlmMinSeverSec set in the registry)
Implement "Extended Session Security" and "Key Exchange" in NTLMSSP
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/libsmbfs/smb/ntlm.h
+++ new/usr/src/lib/libsmbfs/smb/ntlm.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21
22 22 /*
23 23 * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
24 24 * Use is subject to license terms.
25 - * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
25 + *
26 + * Copyright 2018 Nexenta Systems, Inc. All rights reserved.
26 27 */
27 28
28 29 #ifndef _NTLM_H
29 30 #define _NTLM_H
30 31
31 32 /*
32 33 * NTLM support functions
33 34 * See ntlm.c
34 35 */
35 36
36 37 /*
37 38 * Size of all LM/NTLM hashes, challenge
38 39 * NTLM_HASH_SZ: 16 bytes (see smb_lib.h)
39 40 * NTLM_CHAL_SZ: 8 bytes (see smb_lib.h)
40 41 */
41 42 #define NTLM_V1_RESP_SZ 24 /* response size */
42 43
43 44 #define NAMETYPE_EOL 0x0000 /* end of list of names */
44 45 #define NAMETYPE_MACHINE_NB 0x0001 /* NetBIOS machine name */
45 46 #define NAMETYPE_DOMAIN_NB 0x0002 /* NetBIOS domain name */
46 47 #define NAMETYPE_MACHINE_DNS 0x0003 /* DNS machine name */
47 48 #define NAMETYPE_DOMAIN_DNS 0x0004 /* DNS (AD) domain name */
48 49
49 50 int
|
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
50 51 ntlm_compute_lm_hash(uchar_t *hash, const char *pw);
51 52
52 53 int
53 54 ntlm_compute_nt_hash(uchar_t *hash, const char *pw);
54 55
55 56 int
56 57 ntlm_build_target_info(struct smb_ctx *, struct mbuf *, struct mbdata *);
57 58
58 59 int
59 60 ntlm_put_v1_responses(struct smb_ctx *ctx,
60 - struct mbdata *lm_mbp, struct mbdata *nt_mbp);
61 + struct mbdata *lm_mbp, struct mbdata *nt_mbp,
62 + uchar_t *ssnkey);
61 63
62 64 int
63 65 ntlm_put_v1x_responses(struct smb_ctx *ctx,
64 - struct mbdata *lm_mbp, struct mbdata *nt_mbp);
66 + struct mbdata *lm_mbp, struct mbdata *nt_mbp,
67 + uchar_t *ssnkey);
65 68
66 69 int
67 70 ntlm_put_v2_responses(struct smb_ctx *ctx, struct mbdata *ti_mbp,
68 - struct mbdata *lm_mbp, struct mbdata *nt_mbp);
71 + struct mbdata *lm_mbp, struct mbdata *nt_mbp,
72 + uchar_t *ssnkey);
69 73
70 -int
71 -ntlm_build_mac_key(struct smb_ctx *ctx, struct mbdata *ntresp_mbp);
72 -
73 74 void
74 -ntlm2_kxkey(struct smb_ctx *ctx, struct mbdata *lm_mbp, uchar_t *kxkey);
75 +ntlm2_kxkey(struct smb_ctx *ctx, struct mbdata *lm_mbp,
76 + uchar_t *ssn_key, uchar_t *kxkey);
75 77
76 78 #endif /* _NTLM_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX