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

Guenther

diff --git a/librpc/idl/schannel.idl b/librpc/idl/schannel.idl
index a30e2928e0cc0dba8adb679b1de73b6feb653ad7..b597a4395d28d9d52554bb35b94a12e336206945 100644 (file)
--- 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 7be8a8a6f74fd68605e56de88f6eb7af557d61ce..2cc770e11ca4e39a178439bc45d0a9ec8a956b6d 100644 (file)
--- 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 411b12feef2c3a7aa4eec28cd83c5c0f00476013..b1f893f4f89be29e6692936c6a97abe8948b0307 100644 (file)
--- 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 968553a28decf772740beee38fc00f61277df267..4b120426c1977b84b9c41f0574b62c2e242952a9 100644 (file)
--- 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);