/***********************************************************
SMB signing - Common code before we set a new signing implementation
************************************************************/
-static BOOL set_smb_signing_common(struct cli_transport *transport)
+static BOOL set_smb_signing_common(struct smbcli_transport *transport)
{
if (!(transport->negotiate.sec_mode &
(NEGOTIATE_SECURITY_SIGNATURES_REQUIRED|NEGOTIATE_SECURITY_SIGNATURES_ENABLED))) {
/***********************************************************
SMB signing - Common code for 'real' implementations
************************************************************/
-static BOOL set_smb_signing_real_common(struct cli_transport *transport)
+static BOOL set_smb_signing_real_common(struct smbcli_transport *transport)
{
if (transport->negotiate.sign_info.mandatory_signing) {
DEBUG(5, ("Mandatory SMB signing enabled!\n"));
SSVAL(out->hdr, HDR_FLG2, flags2);
}
-static BOOL signing_good(struct cli_request *req, unsigned int seq, BOOL good)
+static BOOL signing_good(struct smbcli_request *req, unsigned int seq, BOOL good)
{
if (good) {
if (!req->transport->negotiate.sign_info.doing_signing) {
req->transport->negotiate.sign_info.doing_signing = False;
if (req->transport->negotiate.sign_info.free_signing_context)
req->transport->negotiate.sign_info.free_signing_context(req->transport);
- cli_null_set_signing(req->transport);
+ smbcli_null_set_signing(req->transport);
return True;
} else {
/* bad packet after signing started - fail and disconnect. */
/***********************************************************
SMB signing - Simple implementation - calculate a MAC to send.
************************************************************/
-static void cli_request_simple_sign_outgoing_message(struct cli_request *req)
+static void smbcli_request_simple_sign_outgoing_message(struct smbcli_request *req)
{
struct smb_basic_signing_context *data = req->transport->negotiate.sign_info.signing_context;
/***********************************************************
SMB signing - Simple implementation - check a MAC sent by server.
************************************************************/
-static BOOL cli_request_simple_check_incoming_message(struct cli_request *req)
+static BOOL smbcli_request_simple_check_incoming_message(struct smbcli_request *req)
{
struct smb_basic_signing_context *data
= req->transport->negotiate.sign_info.signing_context;
/***********************************************************
SMB signing - Simple implementation - free signing context
************************************************************/
-static void cli_transport_simple_free_signing_context(struct cli_transport *transport)
+static void smbcli_transport_simple_free_signing_context(struct smbcli_transport *transport)
{
struct smb_basic_signing_context *data = transport->negotiate.sign_info.signing_context;
/***********************************************************
SMB signing - Simple implementation - setup the MAC key.
************************************************************/
-BOOL cli_transport_simple_set_signing(struct cli_transport *transport,
+BOOL smbcli_transport_simple_set_signing(struct smbcli_transport *transport,
const DATA_BLOB user_session_key,
const DATA_BLOB response)
{
/* Initialise the sequence number */
data->next_seq_num = 0;
- transport->negotiate.sign_info.sign_outgoing_message = cli_request_simple_sign_outgoing_message;
- transport->negotiate.sign_info.check_incoming_message = cli_request_simple_check_incoming_message;
- transport->negotiate.sign_info.free_signing_context = cli_transport_simple_free_signing_context;
+ transport->negotiate.sign_info.sign_outgoing_message = smbcli_request_simple_sign_outgoing_message;
+ transport->negotiate.sign_info.check_incoming_message = smbcli_request_simple_check_incoming_message;
+ transport->negotiate.sign_info.free_signing_context = smbcli_transport_simple_free_signing_context;
return True;
}
/***********************************************************
SMB signing - NULL implementation - calculate a MAC to send.
************************************************************/
-static void cli_request_null_sign_outgoing_message(struct cli_request *req)
+static void smbcli_request_null_sign_outgoing_message(struct smbcli_request *req)
{
/* we can't zero out the sig, as we might be trying to send a
transport request - which is NBT-level, not SMB level and doesn't
/***********************************************************
SMB signing - NULL implementation - check a MAC sent by server.
************************************************************/
-static BOOL cli_request_null_check_incoming_message(struct cli_request *req)
+static BOOL smbcli_request_null_check_incoming_message(struct smbcli_request *req)
{
return True;
}
/***********************************************************
SMB signing - NULL implementation - free signing context
************************************************************/
-static void cli_null_free_signing_context(struct cli_transport *transport)
+static void smbcli_null_free_signing_context(struct smbcli_transport *transport)
{
}
@note Used as an initialisation only - it will not correctly
shut down a real signing mechanism
*/
-BOOL cli_null_set_signing(struct cli_transport *transport)
+BOOL smbcli_null_set_signing(struct smbcli_transport *transport)
{
transport->negotiate.sign_info.signing_context = NULL;
- transport->negotiate.sign_info.sign_outgoing_message = cli_request_null_sign_outgoing_message;
- transport->negotiate.sign_info.check_incoming_message = cli_request_null_check_incoming_message;
- transport->negotiate.sign_info.free_signing_context = cli_null_free_signing_context;
+ transport->negotiate.sign_info.sign_outgoing_message = smbcli_request_null_sign_outgoing_message;
+ transport->negotiate.sign_info.check_incoming_message = smbcli_request_null_check_incoming_message;
+ transport->negotiate.sign_info.free_signing_context = smbcli_null_free_signing_context;
return True;
}
/***********************************************************
SMB signing - TEMP implementation - calculate a MAC to send.
************************************************************/
-static void cli_request_temp_sign_outgoing_message(struct cli_request *req)
+static void smbcli_request_temp_sign_outgoing_message(struct smbcli_request *req)
{
/* mark the packet as signed - BEFORE we sign it...*/
mark_packet_signed(&req->out);
/***********************************************************
SMB signing - TEMP implementation - check a MAC sent by server.
************************************************************/
-static BOOL cli_request_temp_check_incoming_message(struct cli_request *req)
+static BOOL smbcli_request_temp_check_incoming_message(struct smbcli_request *req)
{
return True;
}
/***********************************************************
SMB signing - NULL implementation - free signing context
************************************************************/
-static void cli_temp_free_signing_context(struct cli_transport *transport)
+static void smbcli_temp_free_signing_context(struct smbcli_transport *transport)
{
return;
}
@note Used as an initialisation only - it will not correctly
shut down a real signing mechanism
*/
-BOOL cli_temp_set_signing(struct cli_transport *transport)
+BOOL smbcli_temp_set_signing(struct smbcli_transport *transport)
{
if (!set_smb_signing_common(transport)) {
return False;
transport->negotiate.sign_info.signing_context = NULL;
- transport->negotiate.sign_info.sign_outgoing_message = cli_request_temp_sign_outgoing_message;
- transport->negotiate.sign_info.check_incoming_message = cli_request_temp_check_incoming_message;
- transport->negotiate.sign_info.free_signing_context = cli_temp_free_signing_context;
+ transport->negotiate.sign_info.sign_outgoing_message = smbcli_request_temp_sign_outgoing_message;
+ transport->negotiate.sign_info.check_incoming_message = smbcli_request_temp_check_incoming_message;
+ transport->negotiate.sign_info.free_signing_context = smbcli_temp_free_signing_context;
return True;
}
/**
* Free the signing context
*/
-void cli_transport_free_signing_context(struct cli_transport *transport)
+void smbcli_transport_free_signing_context(struct smbcli_transport *transport)
{
if (transport->negotiate.sign_info.free_signing_context) {
transport->negotiate.sign_info.free_signing_context(transport);
}
- cli_null_set_signing(transport);
+ smbcli_null_set_signing(transport);
}
/**
* Sign a packet with the current mechanism
*/
-void cli_request_calculate_sign_mac(struct cli_request *req)
+void smbcli_request_calculate_sign_mac(struct smbcli_request *req)
{
req->transport->negotiate.sign_info.sign_outgoing_message(req);
}
* @return False if we had an established signing connection
* which had a back checksum, True otherwise
*/
-BOOL cli_request_check_sign_mac(struct cli_request *req)
+BOOL smbcli_request_check_sign_mac(struct smbcli_request *req)
{
BOOL good;
}
-BOOL cli_init_signing(struct cli_transport *transport)
+BOOL smbcli_init_signing(struct smbcli_transport *transport)
{
- if (!cli_null_set_signing(transport)) {
+ if (!smbcli_null_set_signing(transport)) {
return False;
}