mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

Replace custom isc_u?intNN_t types with C99 u?intNN_t types

Browse Source
This commit is contained in:
Ondřej Surý
2018-03-28 14:19:37 +02:00
parent 055278c936
commit cb6a185c69
390 changed files with 2812 additions and 2528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/dns/tsig.c
View File

@@ -11,6 +11,8 @@
/*! \file */
#include <config.h>
#include <inttypes.h>
#include <stdlib.h>
#include <isc/buffer.h>
@@ -830,7 +832,7 @@ dns_tsig_sign(dns_message_t *msg) {
{
unsigned char header[DNS_MESSAGE_HEADERLEN];
isc_buffer_t headerbuf;
isc_uint16_t digestbits;
uint16_t digestbits;
/*
* If it is a response, we assume that the request MAC
@@ -1083,7 +1085,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
unsigned char header[DNS_MESSAGE_HEADERLEN];
dst_context_t *ctx = NULL;
isc_mem_t *mctx;
isc_uint16_t addcount, id;
uint16_t addcount, id;
unsigned int siglen;
unsigned int alg;
isc_boolean_t response;
@@ -1217,7 +1219,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
}
if (tsig.siglen > 0) {
isc_uint16_t addcount_n;
uint16_t addcount_n;
sig_r.base = tsig.signature;
sig_r.length = tsig.siglen;
@@ -1256,7 +1258,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
*/
memmove(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2);
addcount_n = ntohs(addcount);
addcount = htons((isc_uint16_t)(addcount_n - 1));
addcount = htons((uint16_t)(addcount_n - 1));
memmove(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2);
/*
@@ -1365,7 +1367,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
}
if (dns__tsig_algvalid(alg)) {
isc_uint16_t digestbits = dst_key_getbits(key);
uint16_t digestbits = dst_key_getbits(key);
/*
* XXXRAY: Is this correct? What is the expected
@@ -1428,7 +1430,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
dns_tsigkey_t *tsigkey;
dst_key_t *key = NULL;
unsigned char header[DNS_MESSAGE_HEADERLEN];
isc_uint16_t addcount, id;
uint16_t addcount, id;
isc_boolean_t has_tsig = ISC_FALSE;
isc_mem_t *mctx;
unsigned int siglen;
@@ -1557,11 +1559,11 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
* Decrement the additional field counter if necessary.
*/
if (has_tsig) {
isc_uint16_t addcount_n;
uint16_t addcount_n;
memmove(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2);
addcount_n = ntohs(addcount);
addcount = htons((isc_uint16_t)(addcount_n - 1));
addcount = htons((uint16_t)(addcount_n - 1));
memmove(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2);
/*
@@ -1669,7 +1671,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
if (ret != ISC_R_SUCCESS)
goto cleanup_context;
if (dns__tsig_algvalid(alg)) {
isc_uint16_t digestbits = dst_key_getbits(key);
uint16_t digestbits = dst_key_getbits(key);
/*
* XXXRAY: Is this correct? What is the