chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: udp-preload: Proof of concept wrapping
[secnet.git]
/
util.c
diff --git
a/util.c
b/util.c
index b04b3c6cf6f0a923bc32a830c9cbb8af354f32dc..4982c93c58e6ae84fa0d8edc1eefedd59156862a 100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-93,19
+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);
}
-/* Hex-encode a buffer, and return the hex in a freshly allocated string. */
-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;
}
@@
-163,15
+167,13
@@
done:
return ok;
}
return ok;
}
-/* Convert a buffer into its MP_INT representation */
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);
}
-/* Convert a MP_INT into a hex string */
char *write_mpstring(MP_INT *a)
{
char *buff;
char *write_mpstring(MP_INT *a)
{
char *buff;
@@
-181,7
+183,6
@@
char *write_mpstring(MP_INT *a)
return buff;
}
return buff;
}
-/* Convert a MP_INT into a buffer; return length; truncate if necessary */
int32_t write_mpbin(MP_INT *a, uint8_t *buffer, int32_t buflen)
{
char *hb = write_mpstring(a);
int32_t write_mpbin(MP_INT *a, uint8_t *buffer, int32_t buflen)
{
char *hb = write_mpstring(a);
@@
-350,8
+351,6
@@
void *buf_unprepend(struct buffer_if *buf, int32_t amount) {
return p;
}
return p;
}
-/* Append a two-byte length and the string to the buffer. Length is in
- network byte order. */
void buf_append_string(struct buffer_if *buf, cstring_t s)
{
size_t len;
void buf_append_string(struct buffer_if *buf, cstring_t s)
{
size_t len;
@@
-485,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);