chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iaddr_to_string: Do not falsely claim bad addrs are scoped IPv6
[secnet.git]
/
util.c
diff --git
a/util.c
b/util.c
index 4729df417c8adb44758591cb46b8ea788d91eebd..2ce3ade37e1228b2effe9f84671dd1efdc0eb76d 100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-93,18
+93,23
@@
void *safe_malloc_ary(size_t size, size_t count, const char *message) {
return safe_realloc_ary(0,size,count,message);
}
return safe_realloc_ary(0,size,count,message);
}
-
string_t hex_encode(const uint8_t *bin, int binsize
)
+
void hex_encode(const uint8_t *bin, int binsize, char *buff
)
{
{
- char *buff;
int i;
int i;
- buff=safe_malloc(binsize*2 + 1,"hex_encode");
-
for (i=0; i<binsize; i++) {
buff[i*2]=hexdigits[(bin[i] & 0xf0) >> 4];
buff[i*2+1]=hexdigits[(bin[i] & 0xf)];
}
buff[binsize*2]=0;
for (i=0; i<binsize; i++) {
buff[i*2]=hexdigits[(bin[i] & 0xf0) >> 4];
buff[i*2+1]=hexdigits[(bin[i] & 0xf)];
}
buff[binsize*2]=0;
+}
+
+string_t hex_encode_alloc(const uint8_t *bin, int binsize)
+{
+ char *buff;
+
+ buff=safe_malloc(hex_encode_size(binsize),"hex_encode");
+ hex_encode(bin,binsize,buff);
return buff;
}
return buff;
}
@@
-164,7
+169,7
@@
done:
void read_mpbin(MP_INT *a, uint8_t *bin, int binsize)
{
void read_mpbin(MP_INT *a, uint8_t *bin, int binsize)
{
- char *buff = hex_encode(bin, binsize);
+ char *buff = hex_encode
_alloc
(bin, binsize);
mpz_set_str(a, buff, 16);
free(buff);
}
mpz_set_str(a, buff, 16);
free(buff);
}
@@
-479,6
+484,14
@@
int consttime_memeq(const void *s1in, const void *s2in, size_t n)
return accumulator;
}
return accumulator;
}
+void hash_hash(const struct hash_if *hashi, const void *msg, int32_t len,
+ uint8_t *digest) {
+ uint8_t hst[hashi->slen];
+ hashi->init(hst);
+ hashi->update(hst,msg,len);
+ hashi->final(hst,digest);
+}
+
void util_module(dict_t *dict)
{
add_closure(dict,"sysbuffer",buffer_apply);
void util_module(dict_t *dict)
{
add_closure(dict,"sysbuffer",buffer_apply);
@@
-577,7
+590,7
@@
const char *iaddr_to_string(const union iaddr *ia)
int r = adns_addr2text(&ia->sa, 0, addrbuf, &addrbuflen, &port);
if (r) {
int r = adns_addr2text(&ia->sa, 0, addrbuf, &addrbuflen, &port);
if (r) {
- const char fmt[]= "
scoped IPv6
addr, error: %.*s";
+ const char fmt[]= "
bad
addr, error: %.*s";
sprintf(addrbuf, fmt,
(int)(ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt)) /* underestimate */,
strerror(r));
sprintf(addrbuf, fmt,
(int)(ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt)) /* underestimate */,
strerror(r));