s3:smbd: use new simplified snb_signing code in the server

We keep the seqnum/mid mapping in the smb_request structure.

This also moves one global variable into the
smbd_server_connection struct.

metze

1 files changed, 0 insertions, 333 deletions

diff --git a/source3/libsmb/clisigning.c b/source3/libsmb/clisigning.c
index a3ed0e7572..6644bc0d60 100644
--- a/source3/libsmb/clisigning.c
+++ b/source3/libsmb/clisigning.c
@@ -671,336 +671,3 @@ bool client_is_signing_on(struct cli_state *cli)
 	struct smb_sign_info *si = &cli->sign_info;
 	return si->doing_signing;
 }
-
-/***********************************************************
- SMB signing - Server implementation - send the MAC.
-************************************************************/
-
-static void srv_sign_outgoing_message(char *outbuf, struct smb_sign_info *si)
-{
-	unsigned char calc_md5_mac[16];
-	struct smb_basic_signing_context *data =
-		(struct smb_basic_signing_context *)si->signing_context;
-	uint32 send_seq_number = data->send_seq_num-1;
-	uint16 mid;
-
-	if (!si->doing_signing) {
-		return;
-	}
-
-	/* JRA Paranioa test - we should be able to get rid of this... */
-	if (smb_len(outbuf) < (smb_ss_field + 8 - 4)) {
-		DEBUG(1, ("srv_sign_outgoing_message: Logic error. Can't send signature on short packet! smb_len = %u\n",
-					smb_len(outbuf) ));
-		abort();
-	}
-
-	/* mark the packet as signed - BEFORE we sign it...*/
-	mark_packet_signed(outbuf);
-
-	mid = SVAL(outbuf, smb_mid);
-
-	/* See if this is a reply for a deferred packet. */
-	get_sequence_for_reply(&data->outstanding_packet_list, mid, &send_seq_number);
-
-	simple_packet_signature(data, (const unsigned char *)outbuf, send_seq_number, calc_md5_mac);
-
-	DEBUG(10, ("srv_sign_outgoing_message: seq %u: sent SMB signature of\n", (unsigned int)send_seq_number));
-	dump_data(10, calc_md5_mac, 8);
-
-	memcpy(&outbuf[smb_ss_field], calc_md5_mac, 8);
-
-/*	cli->outbuf[smb_ss_field+2]=0; 
-	Uncomment this to test if the remote client actually verifies signatures...*/
-}
-
-/***********************************************************
- SMB signing - Server implementation - check a MAC sent by server.
-************************************************************/
-
-static bool srv_check_incoming_message(const char *inbuf,
-				       struct smb_sign_info *si,
-				       bool must_be_ok)
-{
-	bool good;
-	struct smb_basic_signing_context *data =
-		(struct smb_basic_signing_context *)si->signing_context;
-	uint32 reply_seq_number = data->send_seq_num;
-	uint32 saved_seq;
-	unsigned char calc_md5_mac[16];
-	unsigned char *server_sent_mac;
-
-	if (!si->doing_signing)
-		return True;
-
-	if (smb_len(inbuf) < (smb_ss_field + 8 - 4)) {
-		DEBUG(1, ("srv_check_incoming_message: Can't check signature on short packet! smb_len = %u\n", smb_len(inbuf)));
-		return False;
-	}
-
-	/* We always increment the sequence number. */
-	data->send_seq_num += 2;
-
-	saved_seq = reply_seq_number;
-	simple_packet_signature(data, (const unsigned char *)inbuf, reply_seq_number, calc_md5_mac);
-
-	server_sent_mac = (unsigned char *)&inbuf[smb_ss_field];
-	good = (memcmp(server_sent_mac, calc_md5_mac, 8) == 0);
-
-	if (!good) {
-
-		if (saved_seq) {
-			DEBUG(0, ("srv_check_incoming_message: BAD SIG: seq %u wanted SMB signature of\n",
-					(unsigned int)saved_seq));
-			dump_data(5, calc_md5_mac, 8);
-
-			DEBUG(0, ("srv_check_incoming_message: BAD SIG: seq %u got SMB signature of\n",
-						(unsigned int)reply_seq_number));
-			dump_data(5, server_sent_mac, 8);
-		}
-
-#if 1 /* JRATEST */
-		{
-			int i;
-			reply_seq_number -= 5;
-			for (i = 0; i < 10; i++, reply_seq_number++) {
-				simple_packet_signature(data, (const unsigned char *)inbuf, reply_seq_number, calc_md5_mac);
-				if (memcmp(server_sent_mac, calc_md5_mac, 8) == 0) {
-					DEBUG(0,("srv_check_incoming_message: out of seq. seq num %u matches. \
-We were expecting seq %u\n", reply_seq_number, saved_seq ));
-					break;
-				}
-			}
-		}
-#endif /* JRATEST */
-
-	} else {
-		DEBUG(10, ("srv_check_incoming_message: seq %u: (current is %u) got good SMB signature of\n", (unsigned int)reply_seq_number, (unsigned int)data->send_seq_num));
-		dump_data(10, server_sent_mac, 8);
-	}
-
-	return (signing_good(inbuf, si, good, saved_seq, must_be_ok));
-}
-
-/***********************************************************
- SMB signing - server API's.
-************************************************************/
-
-static struct smb_sign_info srv_sign_info = {
-	null_sign_outgoing_message,
-	null_check_incoming_message,
-	null_free_signing_context,
-	NULL,
-	False,
-	False,
-	False,
-	False
-};
-
-/***********************************************************
- Turn signing off or on for oplock break code.
-************************************************************/
-
-bool srv_oplock_set_signing(bool onoff)
-{
-	bool ret = srv_sign_info.doing_signing;
-	srv_sign_info.doing_signing = onoff;
-	return ret;
-}
-
-/***********************************************************
- Called to validate an incoming packet from the client.
-************************************************************/
-
-bool srv_check_sign_mac(const char *inbuf, bool must_be_ok)
-{
-	/* Check if it's a non-session message. */
-	if(CVAL(inbuf,0)) {
-		return True;
-	}
-
-	return srv_sign_info.check_incoming_message(inbuf, &srv_sign_info, must_be_ok);
-}
-
-/***********************************************************
- Called to sign an outgoing packet to the client.
-************************************************************/
-
-void srv_calculate_sign_mac(char *outbuf)
-{
-	/* Check if it's a non-session message. */
-	if(CVAL(outbuf,0)) {
-		return;
-	}
-
-	srv_sign_info.sign_outgoing_message(outbuf, &srv_sign_info);
-}
-
-/***********************************************************
- Called by server to defer an outgoing packet.
-************************************************************/
-
-void srv_defer_sign_response(uint16 mid)
-{
-	struct smb_basic_signing_context *data;
-
-	if (!srv_sign_info.doing_signing)
-		return;
-
-	data = (struct smb_basic_signing_context *)srv_sign_info.signing_context;
-
-	if (!data)
-		return;
-
-	/*
-	 * Ensure we only store this mid reply once...
-	 */
-
-	store_sequence_for_reply(&data->outstanding_packet_list, mid,
-				 data->send_seq_num-1);
-}
-
-/***********************************************************
- Called to remove sequence records when a deferred packet is
- cancelled by mid. This should never find one....
-************************************************************/
-
-void srv_cancel_sign_response(uint16 mid, bool cancel)
-{
-	struct smb_basic_signing_context *data;
-	uint32 dummy_seq;
-
-	if (!srv_sign_info.doing_signing)
-		return;
-
-	data = (struct smb_basic_signing_context *)srv_sign_info.signing_context;
-
-	if (!data)
-		return;
-
-	DEBUG(10,("srv_cancel_sign_response: for mid %u\n", (unsigned int)mid ));
-
-	while (get_sequence_for_reply(&data->outstanding_packet_list, mid, &dummy_seq))
-		;
-
-	/* cancel doesn't send a reply so doesn't burn a sequence number. */
-	if (cancel) {
-		data->send_seq_num -= 1;
-	}
-}
-
-/***********************************************************
- Called by server negprot when signing has been negotiated.
-************************************************************/
-
-void srv_set_signing_negotiated(void)
-{
-	srv_sign_info.allow_smb_signing = True;
-	srv_sign_info.negotiated_smb_signing = True;
-	if (lp_server_signing() == Required)
-		srv_sign_info.mandatory_signing = True;
-
-	srv_sign_info.sign_outgoing_message = temp_sign_outgoing_message;
-	srv_sign_info.check_incoming_message = temp_check_incoming_message;
-	srv_sign_info.free_signing_context = temp_free_signing_context;
-}
-
-/***********************************************************
- Returns whether signing is active. We can't use sendfile or raw
- reads/writes if it is.
-************************************************************/
-
-bool srv_is_signing_active(void)
-{
-	return srv_sign_info.doing_signing;
-}
-
-
-/***********************************************************
- Returns whether signing is negotiated. We can't use it unless it was
- in the negprot.  
-************************************************************/
-
-bool srv_is_signing_negotiated(void)
-{
-	return srv_sign_info.negotiated_smb_signing;
-}
-
-/***********************************************************
- Returns whether signing is actually happening
-************************************************************/
-
-bool srv_signing_started(void)
-{
-	struct smb_basic_signing_context *data;
-
-	if (!srv_sign_info.doing_signing) {
-		return False;
-	}
-
-	data = (struct smb_basic_signing_context *)srv_sign_info.signing_context;
-	if (!data)
-		return False;
-
-	if (data->send_seq_num == 0) {
-		return False;
-	}
-
-	return True;
-}
-
-/***********************************************************
- Turn on signing from this packet onwards. 
-************************************************************/
-
-void srv_set_signing(const DATA_BLOB user_session_key, const DATA_BLOB response)
-{
-	struct smb_basic_signing_context *data;
-
-	if (!user_session_key.length)
-		return;
-
-	if (!srv_sign_info.negotiated_smb_signing && !srv_sign_info.mandatory_signing) {
-		DEBUG(5,("srv_set_signing: signing negotiated = %u, mandatory_signing = %u. Not allowing smb signing.\n",
-			(unsigned int)srv_sign_info.negotiated_smb_signing,
-			(unsigned int)srv_sign_info.mandatory_signing ));
-		return;
-	}
-
-	/* Once we've turned on, ignore any more sessionsetups. */
-	if (srv_sign_info.doing_signing) {
-		return;
-	}
-
-	if (srv_sign_info.free_signing_context)
-		srv_sign_info.free_signing_context(&srv_sign_info);
-
-	srv_sign_info.doing_signing = True;
-
-	data = SMB_XMALLOC_P(struct smb_basic_signing_context);
-	memset(data, '\0', sizeof(*data));
-
-	srv_sign_info.signing_context = data;
-
-	data->mac_key = data_blob(NULL, response.length + user_session_key.length);
-
-	memcpy(&data->mac_key.data[0], user_session_key.data, user_session_key.length);
-	if (response.length)
-		memcpy(&data->mac_key.data[user_session_key.length],response.data, response.length);
-
-	dump_data_pw("MAC ssession key is:\n", data->mac_key.data, data->mac_key.length);
-
-	DEBUG(3,("srv_set_signing: turning on SMB signing: signing negotiated = %s, mandatory_signing = %s.\n",
-				BOOLSTR(srv_sign_info.negotiated_smb_signing),
-			 	BOOLSTR(srv_sign_info.mandatory_signing) ));
-
-	/* Initialise the sequence number */
-	data->send_seq_num = 0;
-
-	/* Initialise the list of outstanding packets */
-	data->outstanding_packet_list = NULL;
-
-	srv_sign_info.sign_outgoing_message = srv_sign_outgoing_message;
-	srv_sign_info.check_incoming_message = srv_check_incoming_message;
-	srv_sign_info.free_signing_context = simple_free_signing_context;
-}