From 94bae174e1e6d95b1f6bbe2b647994331ab510df Mon Sep 17 00:00:00 2001 From: Federico Lucifredi Date: Thu, 27 Dec 2007 10:12:13 +0000 Subject: type tweaks. git-svn-id: file:///home/lennart/svn/public/avahi/branches/federico@1664 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/domain-util.c | 2 +- avahi-core/domain-util.h | 2 +- avahi-core/wide-area.c | 4 ++-- avahi-core/wide-area.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/avahi-core/domain-util.c b/avahi-core/domain-util.c index 7fa0202..4768a4d 100644 --- a/avahi-core/domain-util.c +++ b/avahi-core/domain-util.c @@ -189,7 +189,7 @@ int avahi_domain_ends_with(const char *domain, const char *suffix) { } /*todo: revise location of this function in this file vs domain.c (and.h) */ -unsigned char * c_to_canonical_string(char* input) +unsigned char * c_to_canonical_string(const char* input) { char *label = avahi_malloc(AVAHI_LABEL_MAX); char *retval = avahi_malloc(AVAHI_DOMAIN_NAME_MAX); diff --git a/avahi-core/domain-util.h b/avahi-core/domain-util.h index b464ec4..75a5321 100644 --- a/avahi-core/domain-util.h +++ b/avahi-core/domain-util.h @@ -43,7 +43,7 @@ int avahi_binary_domain_cmp(const char *a, const char *b); int avahi_domain_ends_with(const char *domain, const char *suffix); /** returns canonical DNS representation of C string representing a domain */ -unsigned char * c_to_canonical_string(char* input); +unsigned char * c_to_canonical_string(const char* input); /** returns canonical wire representation of uint16 */ unsigned char * uint16_to_canonical_string(uint16_t v); diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c index fbe25b4..4d5d2fd 100644 --- a/avahi-core/wide-area.c +++ b/avahi-core/wide-area.c @@ -730,7 +730,7 @@ int avahi_wide_area_has_servers(AvahiWideAreaLookupEngine *e) { /* fill key with HEX format key */ /* r = tsig_sign_packet("dynamic.endorfine.org", key, 16, p, AVAHI_TSIG_HMAC_MD5) */ /* check for NULL on return */ -AvahiRecord* tsig_sign_packet(const char* keyname, const char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm) { +AvahiRecord* tsig_sign_packet(const unsigned char* keyname, const unsigned char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm) { AvahiRecord *r; unsigned char keyed_hash[EVP_MAX_MD_SIZE]; /*used for signing */ @@ -818,7 +818,7 @@ AvahiRecord* tsig_sign_packet(const char* keyname, const char* key, unsigned key canonic = c_to_canonical_string(r->data.tsig.algorithm_name); /* IANA algorithm name in canonical wire format (DNS labels)*/ HMAC_Update(&ctx, canonic, strlen(canonic) +1); - HMAC_Update(&ctx, time_t_to_canonical_string(time_t v), 6); /*uint48 representation of unix time */ + HMAC_Update(&ctx, time_t_to_canonical_string(r->data.tsig.time_signed), 6); /*uint48 representation of unix time */ HMAC_Update(&ctx, uint16_to_canonical_string(r->data.tsig.fudge), 2); diff --git a/avahi-core/wide-area.h b/avahi-core/wide-area.h index 327091f..7c410f0 100644 --- a/avahi-core/wide-area.h +++ b/avahi-core/wide-area.h @@ -45,7 +45,7 @@ void avahi_wide_area_clear_cache(AvahiWideAreaLookupEngine *e); void avahi_wide_area_cleanup(AvahiWideAreaLookupEngine *e); int avahi_wide_area_has_servers(AvahiWideAreaLookupEngine *e); -AvahiRecord* tsig_sign_packet(const char* keyname, const char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm); +AvahiRecord* tsig_sign_packet(const unsigned char* keyname, const unsigned char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm); void wide_area_publish(AvahiRecord *r, char *zone, uint16_t id); AvahiWideAreaLookup *avahi_wide_area_lookup_new(AvahiWideAreaLookupEngine *e, AvahiKey *key, AvahiWideAreaLookupCallback callback, void *userdata); -- cgit