X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/800d4c590fc75ba21ae7b742fe11472cdc71d4a1..8f45ff6cb9a269fc6f8f631908f93b4c8123419c:/buf.c diff --git a/buf.c b/buf.c index e34d876..9594349 100644 --- a/buf.c +++ b/buf.c @@ -7,32 +7,31 @@ * (c) 2001 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * - * This file is part of Catacomb. + * This file is part of the mLib utilities library. * - * Catacomb is free software; you can redistribute it and/or modify + * mLib is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. - * - * Catacomb is distributed in the hope that it will be useful, + * + * mLib 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 Library General Public License for more details. - * + * * You should have received a copy of the GNU Library General Public - * License along with Catacomb; if not, write to the Free + * License along with mLib; if not, write to the Free * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. */ /*----- Header files ------------------------------------------------------*/ +#include #include -#include "mp.h" -#include "ec.h" #include "buf.h" /*----- Main code ---------------------------------------------------------*/ @@ -169,81 +168,45 @@ int buf_putbyte(buf *b, int ch) return (0); } -/* --- @buf_getu16@ --- * - * - * Arguments: @buf *b@ = pointer to a buffer block - * @uint16 *w@ = where to put the word - * - * Returns: Zero if OK, or nonzero if there wasn't a word there. - * - * Use: Gets a 16-bit word from a buffer. - */ - -int buf_getu16(buf *b, uint16 *w) -{ - if (BENSURE(b, 2)) - return (-1); - *w = LOAD16(b->p); - BSTEP(b, 2); - return (0); -} - -/* --- @buf_putu16@ --- * - * - * Arguments: @buf *b@ = pointer to a buffer block - * @uint16 w@ = word to write - * - * Returns: Zero if OK, nonzero if there wasn't enough space. - * - * Use: Puts a 16-but word in a buffer. - */ - -int buf_putu16(buf *b, uint16 w) -{ - if (BENSURE(b, 2)) - return (-1); - STORE16(b->p, w); - BSTEP(b, 2); - return (0); -} - -/* --- @buf_getu32@ --- * +/* --- @buf_getu{8,{16,24,32,64}{,l,b}}@ --- * * * Arguments: @buf *b@ = pointer to a buffer block - * @uint32 *w@ = where to put the word + * @uintSZ *w@ = where to put the word * * Returns: Zero if OK, or nonzero if there wasn't a word there. * - * Use: Gets a 32-bit word from a buffer. + * Use: Gets a word of appropriate size and order from a buffer. */ -int buf_getu32(buf *b, uint32 *w) -{ - if (BENSURE(b, 4)) - return (-1); - *w = LOAD32(b->p); - BSTEP(b, 4); - return (0); -} +#define BUF_GETU_(n, W, w) \ + int buf_getu##w(buf *b, uint##n *ww) \ + { \ + if (BENSURE(b, SZ_##W)) return (-1); \ + *ww = LOAD##W(b->p); \ + BSTEP(b, SZ_##W); \ + return (0); \ + } +DOUINTCONV(BUF_GETU_) -/* --- @buf_putu32@ --- * +/* --- @buf_putu{8,{16,24,32,64}{,l,b}}@ --- * * * Arguments: @buf *b@ = pointer to a buffer block - * @uint32 w@ = word to write + * @uintSZ w@ = word to write * - * Returns: Zero if OK, nonzero if there wasn't enough space. + * Returns: Zero if OK, or nonzero if there wasn't enough space * - * Use: Puts a 32-but word in a buffer. + * Use: Puts a word into a buffer with appropriate size and order. */ -int buf_putu32(buf *b, uint32 w) -{ - if (BENSURE(b, 4)) - return (-1); - STORE32(b->p, w); - BSTEP(b, 4); - return (0); -} +#define BUF_PUTU_(n, W, w) \ + int buf_putu##w(buf *b, uint##n ww) \ + { \ + if (BENSURE(b, SZ_##W)) return (-1); \ + STORE##W(b->p, ww); \ + BSTEP(b, SZ_##W); \ + return (0); \ + } +DOUINTCONV(BUF_PUTU_) /* --- @findz@ --- * * @@ -259,7 +222,7 @@ static int findz(buf *b, size_t *nn) { octet *p; - if ((p = memchr(BCUR(b), 0, BLEN(b))) == 0) { + if ((p = memchr(BCUR(b), 0, BLEFT(b))) == 0) { buf_break(b); return (-1); } @@ -267,53 +230,35 @@ static int findz(buf *b, size_t *nn) return (0); } -#define DOSUFFIXES(DO) DO(8) DO(16) DO(32) DO(z) - -/* --- @buf_getmem{8,16,32,z} --- * +/* --- @buf_getmem{8,{16,24,32,64}{,l,b},z} --- * * * Arguments: @buf *b@ = pointer to a buffer block * @size_t *nn@ = where to put the length * * Returns: Pointer to the buffer data, or null. * - * Use: Gets a chunk of memory from a buffer. The number, @16@ or - * @32@, is the width of the length; @z@ means null-terminated. + * Use: Gets a chunk of memory from a buffer. The suffix is the + * width and byte order of the length; @z@ means null- + * terminated. */ -void *buf_getmem8(buf *b, size_t *nn) -{ - int n; - - if ((n = buf_getbyte(b)) < 0) return (0); - *nn = n; - return (buf_get(b, n)); -} - -void *buf_getmem16(buf *b, size_t *nn) -{ - uint16 n; - - if (buf_getu16(b, &n)) return (0); - *nn = n; - return (buf_get(b, n)); -} - -void *buf_getmem32(buf *b, size_t *nn) -{ - uint32 n; +#define BUF_GETMEM_(n, W, w) \ + void *buf_getmem##w(buf *b, size_t *nn) \ + { \ + uint##n sz; \ + if (buf_getu##w(b, &sz)) return (0); \ + *nn = sz; \ + return (buf_get(b, sz)); \ + } +DOUINTCONV(BUF_GETMEM_) - if (buf_getu32(b, &n)) return (0); - *nn = n; - return (buf_get(b, n)); -} - void *buf_getmemz(buf *b, size_t *nn) { if (findz(b, nn)) return (0); return (buf_get(b, *nn)); } -/* --- @buf_putmem{8,16,32,z} --- * +/* --- @buf_putmem{8,{16,24,32,64}{,l,b},z} --- * * * Arguments: @buf *b@ = pointer to a buffer block * @const void *p@ = pointer to data to write @@ -321,33 +266,20 @@ void *buf_getmemz(buf *b, size_t *nn) * * Returns: Zero if OK, nonzero if there wasn't enough space. * - * Use: Writes a chunk of data to a buffer. The number, @16@ or - * @32@, is the width of the length; @z@ means null-terminated. + * Use: Writes a chunk of data to a buffer. The suffix is the + * width and byte order of the length; @z@ means null- + * terminated. */ -int buf_putmem8(buf *b, const void *p, size_t n) -{ - assert(n <= 0xfful); - if (buf_putbyte(b, n) || buf_put(b, p, n)) - return (-1); - return (0); -} - -int buf_putmem16(buf *b, const void *p, size_t n) -{ - assert(n <= 0xfffful); - if (buf_putu16(b, n) || buf_put(b, p, n)) - return (-1); - return (0); -} - -int buf_putmem32(buf *b, const void *p, size_t n) -{ - assert(n <= 0xfffffffful); - if (buf_putu32(b, n) || buf_put(b, p, n)) - return (-1); - return (0); -} +#define BUF_PUTMEM_(n, W, w) \ + int buf_putmem##w(buf *b, const void *p, size_t sz) \ + { \ + assert(sz <= MASK##W); \ + if (buf_putu##w(b, sz) || buf_put(b, p, sz)) \ + return (-1); \ + return (0); \ + } +DOUINTCONV(BUF_PUTMEM_) int buf_putmemz(buf *b, const void *p, size_t n) { @@ -361,7 +293,7 @@ int buf_putmemz(buf *b, const void *p, size_t n) return (0); } -/* --- @buf_getbuf{8,16,32,z}@ --- * +/* --- @buf_getbuf{8,{16,24,32,64}{,l,b},z} --- * * * Arguments: @buf *b@ = pointer to a buffer block * @buf *bb@ = where to put the result @@ -369,165 +301,50 @@ int buf_putmemz(buf *b, const void *p, size_t n) * Returns: Zero if it worked, nonzero if there wasn't enough space. * * Use: Gets a block of data from a buffer, and writes its bounds to - * another buffer. The number, @16@ or @32@, is the width of - * the length; @z@ means null-terminated. - */ - -#define GETBUF(suff) int buf_getbuf##suff(buf *b, buf *bb) \ -{ \ - void *p; \ - size_t n; \ - \ - if ((p = buf_getmem##suff(b, &n)) == 0) \ - return (-1); \ - buf_init(bb, p, n); \ - return (0); \ -} -DOSUFFIXES(GETBUF) - -/* --- @buf_putbuf{8,16,32,z}@ --- * - * - * Arguments: @buf *b@ = pointer to a buffer block - * @buf *bb@ = buffer to write - * - * Returns: Zero if it worked, nonzero if there wasn't enough space. - * - * Use: Puts the contents of a buffer to a buffer. The number, @16@ - * or @32@, is the width of the length; @z@ means null- - * terminated. - */ - -#define PUTBUF(suff) int buf_putbuf##suff(buf *b, buf *bb) \ - { return (buf_putmem##suff(b, BBASE(bb), BLEN(bb))); } -DOSUFFIXES(PUTBUF) - -/* --- @buf_getstr{8,16,32,z}@ --- * - * - * Arguments: @buf *b@ = pointer to a buffer block - * @dstr *d@ = where to put the result - * - * Returns: Zero if it worked, nonzero if there wasn't enough space. - * - * Use: Gets a block of data from a buffer, and writes its contents - * to a string. The number, @16@ or @32@, is the width of the - * length; @z@ means null-terminated. + * another buffer. */ -#define GETSTR(suff) int buf_getstr##suff(buf *b, dstr *d) \ -{ \ - void *p; \ - size_t n; \ +#define BUF_GETBUF_(n, W, w) \ + int buf_getbuf##w(buf *b, buf *bb) \ + { \ + void *p; \ + size_t sz; \ \ - if ((p = buf_getmem##suff(b, &n)) == 0) \ - return (-1); \ - DPUTM(d, p, n); \ - return (0); \ -} -DOSUFFIXES(GETSTR) - -/* --- @buf_putstr{8,16,32,z}@ --- * - * - * Arguments: @buf *b@ = pointer to a buffer block - * @dstr *d@ = string to write - * - * Returns: Zero if it worked, nonzero if there wasn't enough space. - * - * Use: Puts a string to a buffer, and writes its bounds to - * another buffer. The number, @16@ or @32@, is the width of - * the length; @z@ means null-terminated. - */ - -#define PUTSTR(suff) int buf_putstr##suff(buf *b, dstr *d) \ - { return (buf_putmem##suff(b, d->buf, d->len)); } -DOSUFFIXES(PUTSTR) - -/* --- @buf_getmp@ --- * - * - * Arguments: @buf *b@ = pointer to a buffer block - * - * Returns: A multiprecision integer, or null if there wasn't one there. - * - * Use: Gets a multiprecision integer from a buffer. - */ - -mp *buf_getmp(buf *b) -{ - uint16 sz; - size_t n; - mp *m; - if (buf_getu16(b, &sz) || buf_ensure(b, sz)) - return (0); - m = mp_loadb(MP_NEW, BCUR(b), sz); - n = mp_octets(m); - if (n != sz && n != 0 && sz != 1) { - mp_drop(m); - return (0); + if ((p = buf_getmem##w(b, &sz)) == 0) \ + return (-1); \ + buf_init(bb, p, sz); \ + return (0); \ } - BSTEP(b, sz); - return (m); -} +BUF_DOSUFFIXES(BUF_GETBUF_) -/* --- @buf_putmp@ --- * +/* --- @buf_putbuf{8,{16,24,32,64}{,l,b},z} --- * * * Arguments: @buf *b@ = pointer to a buffer block - * @mp *m@ = a multiprecision integer + * @buf *bb@ = buffer to write * * Returns: Zero if it worked, nonzero if there wasn't enough space. * - * Use: Puts a multiprecision integer to a buffer. + * Use: Puts the contents of a buffer to a buffer. */ -int buf_putmp(buf *b, mp *m) -{ - size_t sz = mp_octets(m); - assert(sz < MASK16); - if (!sz) sz = 1; - if (buf_putu16(b, sz) || buf_ensure(b, sz)) - return (-1); - mp_storeb(m, BCUR(b), sz); - BSTEP(b, sz); - return (0); -} +#define BUF_PUTBUF_(n, W, w) \ + int buf_putbuf##w(buf *b, buf *bb) \ + { return (buf_putmem##w(b, BBASE(bb), BLEN(bb))); } +BUF_DOSUFFIXES(BUF_PUTBUF_) -/* --- @buf_getec@ --- * +/* --- @buf_putstr{8,{16,24,32,64}{,l,b},z} --- * * * Arguments: @buf *b@ = pointer to a buffer block - * @ec *p@ = where to put the point - * - * Returns: Zero if it worked, nonzero if it failed. - * - * Use: Gets a multiprecision integer from a buffer. The point must - * be initialized. - */ - -int buf_getec(buf *b, ec *p) -{ - mp *x = 0, *y = 0; - uint16 n; - if (buf_ensure(b, 2)) return (-1); - n = LOAD16(BCUR(b)); if (!n) { BSTEP(b, 2); EC_SETINF(p); return (0); } - if ((x = buf_getmp(b)) == 0 || (y = buf_getmp(b)) == 0) { - mp_drop(x); mp_drop(y); return (-1); - } - EC_DESTROY(p); p->x = x; p->y = y; p->z = 0; - return (0); -} - -/* --- @buf_putec@ --- * - * - * Arguments: @buf *b@ = pointer to a buffer block - * @ec *p@ = an elliptic curve point + * @const char *p@ = string to write * * Returns: Zero if it worked, nonzero if there wasn't enough space. * - * Use: Puts an elliptic curve point to a buffer. + * Use: Puts a null-terminated string to a buffer. */ -int buf_putec(buf *b, ec *p) -{ - if (EC_ATINF(p)) return (buf_putu16(b, 0)); - if (buf_putmp(b, p->x) || buf_putmp(b, p->y)) return (-1); - return (0); -} +#define BUF_PUTSTR_(n, W, w) \ + int buf_putstr##w(buf *b, const char *p) \ + { return (buf_putmem##w(b, p, strlen(p))); } +BUF_DOSUFFIXES(BUF_PUTSTR_) /*----- That's all, folks -------------------------------------------------*/