diff options
| author | Günther Deschner <gd@samba.org> | 2010-07-16 23:09:54 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-07-16 23:09:54 +0200 |
| commit | c5e85a4987ca846741efac855aaf313d851d954c (patch) | |
| tree | 491238f84ef07871351efa171351b90e3e0395df | |
| parent | 5815119cb0ca56f5155936d99dae5fc9e4a53db8 (diff) | |
| download | samba-c5e85a4987ca846741efac855aaf313d851d954c.tar.gz samba-c5e85a4987ca846741efac855aaf313d851d954c.tar.bz2 samba-c5e85a4987ca846741efac855aaf313d851d954c.zip | |
s3-dcerpc: rename SCHANNEL_SIG_SIZE to NL_AUTH_SIGNATURE_SIZE and move to IDL.
Guenther
| -rw-r--r-- | librpc/idl/schannel.idl | 2 | ||||
| -rw-r--r-- | source3/include/rpc_dce.h | 2 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 4 | ||||
| -rw-r--r-- | source3/rpc_server/srv_pipe.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/librpc/idl/schannel.idl b/librpc/idl/schannel.idl index a30e2928e0..b597a4395d 100644 --- a/librpc/idl/schannel.idl +++ b/librpc/idl/schannel.idl @@ -90,6 +90,8 @@ interface schannel uint8 Confounder[8]; } NL_AUTH_SIGNATURE; + const int NL_AUTH_SIGNATURE_SIZE = 0x20; + /* MS-NRPC 2.2.1.3.3 NL_AUTH_SHA2_SIGNATURE */ typedef [public,flag(NDR_PAHEX)] struct { diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h index 7be8a8a6f7..2cc770e11c 100644 --- a/source3/include/rpc_dce.h +++ b/source3/include/rpc_dce.h @@ -22,8 +22,6 @@ #ifndef _DCE_RPC_H /* _DCE_RPC_H */ #define _DCE_RPC_H -#define SCHANNEL_SIG_SIZE 0x20 - /* Maximum size of the signing data in a fragment. */ #define RPC_MAX_SIGN_SIZE 0x38 /* 56 */ diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 411b12feef..b1f893f4f8 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -722,7 +722,7 @@ static NTSTATUS cli_pipe_verify_schannel(struct rpc_pipe_client *cli, return NT_STATUS_OK; } - if (pkt->auth_length < SCHANNEL_SIG_SIZE) { + if (pkt->auth_length < NL_AUTH_SIGNATURE_SIZE) { DEBUG(0, ("auth_len %u.\n", (unsigned int)pkt->auth_length)); return NT_STATUS_INVALID_PARAMETER; } @@ -1991,7 +1991,7 @@ static uint32 calculate_data_len_tosend(struct rpc_pipe_client *cli, *p_auth_len = NTLMSSP_SIG_SIZE; break; case PIPE_AUTH_TYPE_SCHANNEL: - *p_auth_len = SCHANNEL_SIG_SIZE; + *p_auth_len = NL_AUTH_SIGNATURE_SIZE; break; default: smb_panic("bad auth type"); diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 968553a28d..4b120426c1 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -427,7 +427,7 @@ bool create_next_pdu(pipes_struct *p) case PIPE_AUTH_TYPE_SCHANNEL: if (!create_next_packet(p, auth_type, p->auth.auth_level, - SCHANNEL_SIG_SIZE)) { + NL_AUTH_SIGNATURE_SIZE)) { return false; } return add_schannel_auth(p); |