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

librpc/dns: remove original_id from dns_fake_tsig_rec

Browse Source 
Cf RFC2845, 3.4.2. "TSIG Variables", the request id (original_id) is not
used in the MAC calculation. This also explains the mysterious 2 bytes
padding.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=11520

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Ralph Boehme 2016-05-14 19:08:51 +02:00 committed by Garming Sam
parent a51f998956
commit bea4aec521
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
librpc/idl/dns.idl
View File

@ -212,7 +212,6 @@ interface dns
uint16 time_prefix; /* 0 until February 2106*/ uint16 time_prefix; /* 0 until February 2106*/
uint32 time; uint32 time;
uint16 fudge; uint16 fudge;
uint16 original_id;
uint16 error; uint16 error;
uint16 other_size; uint16 other_size;
uint8 other_data[other_size]; uint8 other_data[other_size];

3
source4/dns_server/dns_crypto.c
View File

@ -207,9 +207,6 @@ WERROR dns_verify_tsig(struct dns_server *dns,
return WERR_NOMEM; return WERR_NOMEM;
} }
/*FIXME: Why is there too much padding? */
buffer_len -= 2;
/* Now we also need to count down the additional record counter */ /* Now we also need to count down the additional record counter */
arcount = RSVAL(buffer, 10); arcount = RSVAL(buffer, 10);
RSSVAL(buffer, 10, arcount-1); RSSVAL(buffer, 10, arcount-1);