drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-02-21 20:42:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix compiler warnings: -Wtype-limits (comparsion always false)

Browse Source
This commit is contained in:
[anp/hsw] 2024-08-03 10:32:53 +07:00
parent 1db0c81930
commit da15c82273
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mdig/mdig.c
View File

@ -74,7 +74,7 @@ static const char* eai_str(int r)
} }
} }
bool dom_valid(char *dom) bool dom_valid(uint8_t *dom)
{ {
if (!dom || *dom=='.') return false; if (!dom || *dom=='.') return false;
for (; *dom; dom++) for (; *dom; dom++)
@ -82,7 +82,7 @@ bool dom_valid(char *dom)
return false; return false;
return true; return true;
} }
void invalid_domain_beautify(char *dom) void invalid_domain_beautify(uint8_t *dom)
{ {
for (int i = 0; *dom && i < 64; i++, dom++) for (int i = 0; *dom && i < 64; i++, dom++)
if (*dom < 0x20 || *dom>0x7F) *dom = '?'; if (*dom < 0x20 || *dom>0x7F) *dom = '?';
@ -238,7 +238,7 @@ static void *t_resolver(void *arg)
else else
VLOG("wrong address family %s", s_ip); VLOG("wrong address family %s", s_ip);
} }
else if (dom_valid(dom)) else if (dom_valid((uint8_t *)dom))
{ {
VLOG("resolving %s", dom); VLOG("resolving %s", dom);
for (i = 0; i < RESOLVER_EAGAIN_ATTEMPTS; i++) for (i = 0; i < RESOLVER_EAGAIN_ATTEMPTS; i++)
@ -261,7 +261,7 @@ static void *t_resolver(void *arg)
{ {
char dom2[sizeof(dom)]; char dom2[sizeof(dom)];
strcpy(dom2,dom); strcpy(dom2,dom);
invalid_domain_beautify(dom2); invalid_domain_beautify((uint8_t *)dom2);
VLOG("invalid domain : %s", dom2); VLOG("invalid domain : %s", dom2);
} }
interlocked_fprintf(is_ok ? glob.F_log_resolved : glob.F_log_failed,"%s\n",dom); interlocked_fprintf(is_ok ? glob.F_log_resolved : glob.F_log_failed,"%s\n",dom);

6
nfq/crypto/hkdf.c
View File

@ -103,9 +103,6 @@ int hkdfExtract(SHAversion whichSha,
salt_len = USHAHashSize(whichSha); salt_len = USHAHashSize(whichSha);
memset(nullSalt, '\0', salt_len); memset(nullSalt, '\0', salt_len);
} }
else if (salt_len < 0) {
return shaBadParam;
}
return hmac(whichSha, ikm, ikm_len, salt, salt_len, prk); return hmac(whichSha, ikm, ikm_len, salt, salt_len, prk);
} }
@ -154,9 +151,6 @@ int hkdfExpand(SHAversion whichSha, const uint8_t prk[], size_t prk_len,
info = (const unsigned char *)""; info = (const unsigned char *)"";
info_len = 0; info_len = 0;
} }
else if (info_len < 0) {
return shaBadParam;
}
if (okm_len <= 0) return shaBadParam; if (okm_len <= 0) return shaBadParam;
if (!okm) return shaBadParam; if (!okm) return shaBadParam;