1
0
mirror of https://github.com/samba-team/samba.git synced 2025-12-04 08:23:50 +03:00

r21922: Fixed the build by rather horrid means. I really need

to restructure libsmb/smb_signing.c so it isn't in
the base libs path but lives in libsmb instead (like
smb_seal.c does).
Jeremy.
This commit is contained in:
Jeremy Allison
2007-03-21 23:49:57 +00:00
committed by Gerald (Jerry) Carter
parent 58d2ec00d2
commit 1b828f051d
7 changed files with 81 additions and 100 deletions

View File

@@ -585,9 +585,7 @@ void cli_free_signing_context(struct cli_state *cli)
void cli_calculate_sign_mac(struct cli_state *cli)
{
if (!cli_encryption_on(cli)) {
cli->sign_info.sign_outgoing_message(cli->outbuf, &cli->sign_info);
}
cli->sign_info.sign_outgoing_message(cli->outbuf, &cli->sign_info);
}
/**
@@ -598,9 +596,6 @@ void cli_calculate_sign_mac(struct cli_state *cli)
BOOL cli_check_sign_mac(struct cli_state *cli)
{
if (cli_encryption_on(cli)) {
return True;
}
if (!cli->sign_info.check_incoming_message(cli->inbuf, &cli->sign_info, True)) {
free_signing_context(&cli->sign_info);
return False;
@@ -617,9 +612,6 @@ BOOL client_set_trans_sign_state_on(struct cli_state *cli, uint16 mid)
struct smb_sign_info *si = &cli->sign_info;
struct smb_basic_signing_context *data = (struct smb_basic_signing_context *)si->signing_context;
if (cli_encryption_on(cli)) {
return True;
}
if (!si->doing_signing) {
return True;
}
@@ -645,9 +637,6 @@ BOOL client_set_trans_sign_state_off(struct cli_state *cli, uint16 mid)
struct smb_sign_info *si = &cli->sign_info;
struct smb_basic_signing_context *data = (struct smb_basic_signing_context *)si->signing_context;
if (cli_encryption_on(cli)) {
return True;
}
if (!si->doing_signing) {
return True;
}
@@ -813,15 +802,6 @@ BOOL srv_check_sign_mac(char *inbuf, BOOL must_be_ok)
return True;
}
/*
* If we have an encrypted transport
* don't sign - we're already doing that.
*/
if (srv_encryption_on()) {
return True;
}
return srv_sign_info.check_incoming_message(inbuf, &srv_sign_info, must_be_ok);
}
@@ -836,15 +816,6 @@ void srv_calculate_sign_mac(char *outbuf)
return;
}
/*
* If we have an encrypted transport
* don't check sign - we're already doing that.
*/
if (srv_encryption_on()) {
return;
}
srv_sign_info.sign_outgoing_message(outbuf, &srv_sign_info);
}