sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-11 09:44:19 +03:00
Code Activity

s3-dcerpc: rename SCHANNEL_SIG_SIZE to NL_AUTH_SIGNATURE_SIZE and move to IDL.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner
2010-07-16 23:09:54 +02:00
parent 5815119cb0
commit c5e85a4987
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
librpc/idl/schannel.idl
View File

@@ -90,6 +90,8 @@ interface schannel
uint8 Confounder[8]; uint8 Confounder[8];
} NL_AUTH_SIGNATURE; } NL_AUTH_SIGNATURE;
const int NL_AUTH_SIGNATURE_SIZE = 0x20;
/* MS-NRPC 2.2.1.3.3 NL_AUTH_SHA2_SIGNATURE */ /* MS-NRPC 2.2.1.3.3 NL_AUTH_SHA2_SIGNATURE */
typedef [public,flag(NDR_PAHEX)] struct { typedef [public,flag(NDR_PAHEX)] struct {

2
source3/include/rpc_dce.h
View File

@@ -22,8 +22,6 @@
#ifndef _DCE_RPC_H /* _DCE_RPC_H */ #ifndef _DCE_RPC_H /* _DCE_RPC_H */
#define _DCE_RPC_H #define _DCE_RPC_H
#define SCHANNEL_SIG_SIZE 0x20
/* Maximum size of the signing data in a fragment. */ /* Maximum size of the signing data in a fragment. */
#define RPC_MAX_SIGN_SIZE 0x38 /* 56 */ #define RPC_MAX_SIGN_SIZE 0x38 /* 56 */

4
source3/rpc_client/cli_pipe.c
View File

@@ -722,7 +722,7 @@ static NTSTATUS cli_pipe_verify_schannel(struct rpc_pipe_client *cli,
return NT_STATUS_OK; 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)); DEBUG(0, ("auth_len %u.\n", (unsigned int)pkt->auth_length));
return NT_STATUS_INVALID_PARAMETER; 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; *p_auth_len = NTLMSSP_SIG_SIZE;
break; break;
case PIPE_AUTH_TYPE_SCHANNEL: case PIPE_AUTH_TYPE_SCHANNEL:
*p_auth_len = SCHANNEL_SIG_SIZE; *p_auth_len = NL_AUTH_SIGNATURE_SIZE;
break; break;
default: default:
smb_panic("bad auth type"); smb_panic("bad auth type");

2
source3/rpc_server/srv_pipe.c
View File

@@ -427,7 +427,7 @@ bool create_next_pdu(pipes_struct *p)
case PIPE_AUTH_TYPE_SCHANNEL: case PIPE_AUTH_TYPE_SCHANNEL:
if (!create_next_packet(p, auth_type, if (!create_next_packet(p, auth_type,
p->auth.auth_level, p->auth.auth_level,
SCHANNEL_SIG_SIZE)) { NL_AUTH_SIGNATURE_SIZE)) {
return false; return false;
} }
return add_schannel_auth(p); return add_schannel_auth(p);