chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
style: util.[ch]: Introduce hex_encode_alloc name
[secnet.git]
/
util.c
diff --git
a/util.c
b/util.c
index 4729df417c8adb44758591cb46b8ea788d91eebd..5200e18ef3bbb315f9e3a233077883732ff1b3c4 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);
}