X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/b7886fd46ab05c97b8a072e497903622bd1d5290..refs/heads/mdw/xdh:/util.c diff --git a/util.c b/util.c index 1d05822..b04b3c6 100644 --- a/util.c +++ b/util.c @@ -6,26 +6,22 @@ * - MPI convenience functions */ /* - * This file is - * Copyright (C) 1995--2001 Stephen Early + * This file is part of secnet. + * See README for full list of copyright holders. * - * It is part of secnet, which is - * Copyright (C) 1995--2001 Stephen Early - * Copyright (C) 1998 Ross Anderson, Eli Biham, Lars Knudsen - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * secnet is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * secnet is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * version 3 along with secnet; if not, see + * https://www.gnu.org/licenses/gpl.html. */ #include "secnet.h" @@ -97,31 +93,19 @@ void *safe_malloc_ary(size_t size, size_t count, const char *message) { return safe_realloc_ary(0,size,count,message); } -/* Convert a buffer into its MP_INT representation */ -void read_mpbin(MP_INT *a, uint8_t *bin, int binsize) +/* Hex-encode a buffer, and return the hex in a freshly allocated string. */ +string_t hex_encode(const uint8_t *bin, int binsize) { char *buff; int i; - buff=safe_malloc(binsize*2 + 1,"read_mpbin"); + buff=safe_malloc(binsize*2 + 1,"hex_encode"); for (i=0; i> 4]; buff[i*2+1]=hexdigits[(bin[i] & 0xf)]; } buff[binsize*2]=0; - - mpz_set_str(a, buff, 16); - free(buff); -} - -/* Convert a MP_INT into a hex string */ -char *write_mpstring(MP_INT *a) -{ - char *buff; - - buff=safe_malloc(mpz_sizeinbase(a,16)+2,"write_mpstring"); - mpz_get_str(buff, 16, a); return buff; } @@ -154,27 +138,57 @@ static uint8_t hexval(uint8_t c) return -1; } -/* 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) +bool_t hex_decode(uint8_t *buffer, int32_t buflen, int32_t *outlen, + cstring_t hb, bool_t allow_odd_nibble) { - char *hb; - int i,j,l; - - if (buflen==0) return 0; - hb=write_mpstring(a); - - l=strlen(hb); - i=0; j=0; + int i = 0, j = 0, l = strlen(hb), hi, lo; + bool_t ok = False; + + if (!l || !buflen) { ok = !l; goto done; } if (l&1) { /* The number starts with a half-byte */ - buffer[i++]=hexval(hb[j++]); + if (!allow_odd_nibble) goto done; + lo = hexval(hb[j++]); if (lo < 0) goto done; + buffer[i++] = lo; } - for (; hb[j] && icomm->sendmsg(dest->comm->st, buf, dest); + dest->comm->sendmsg(dest->comm->st, buf, dest, 0); } int consttime_memeq(const void *s1in, const void *s2in, size_t n) @@ -525,7 +539,8 @@ void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia, #ifndef CONFIG_IPV6 ia->sin.sin_family=AF_INET; - ia->sin.sin_addr.s_addr=string_item_to_ipaddr(item,desc); + ia->sin.sin_addr.s_addr=htonl(string_item_to_ipaddr(item,desc)); + ia->sin.sin_port=htons(port); #else /* CONFIG_IPV6 => we have adns_text2addr */ @@ -542,33 +557,27 @@ void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia, #endif /* CONFIG_IPV6 */ } -#define IADDR_NBUFS_SHIFT 3 -#define IADDR_NBUFS (1 << IADDR_NBUFS_SHIFT) +#define IADDR_NBUFS 8 const char *iaddr_to_string(const union iaddr *ia) { - static int b; - - b++; - b &= IADDR_NBUFS-1; - #ifndef CONFIG_IPV6 - static char bufs[IADDR_NBUFS][100]; + SBUF_DEFINE(IADDR_NBUFS, 100); assert(ia->sa.sa_family == AF_INET); - snprintf(bufs[b], sizeof(bufs[b]), "[%s]:%d", + snprintf(SBUF, sizeof(SBUF), "[%s]:%d", inet_ntoa(ia->sin.sin_addr), ntohs(ia->sin.sin_port)); #else /* CONFIG_IPV6 => we have adns_addr2text */ - static char bufs[IADDR_NBUFS][1+ADNS_ADDR2TEXT_BUFLEN+20]; + SBUF_DEFINE(IADDR_NBUFS, 1+ADNS_ADDR2TEXT_BUFLEN+20); int port; - char *addrbuf = bufs[b]; + char *addrbuf = SBUF; *addrbuf++ = '['; int addrbuflen = ADNS_ADDR2TEXT_BUFLEN; @@ -576,7 +585,7 @@ const char *iaddr_to_string(const union iaddr *ia) if (r) { const char fmt[]= "scoped IPv6 addr, error: %.*s"; sprintf(addrbuf, fmt, - ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt) /* underestimate */, + (int)(ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt)) /* underestimate */, strerror(r)); } @@ -584,11 +593,11 @@ const char *iaddr_to_string(const union iaddr *ia) int addrl = strlen(addrbuf); portbuf += addrl; - snprintf(portbuf, sizeof(bufs[b])-addrl, "]:%d", port); + snprintf(portbuf, sizeof(SBUF)-addrl, "]:%d", port); #endif /* CONFIG_IPV6 */ - return bufs[b]; + return SBUF; } bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib,