[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS gsasl/lib/gl
From: |
gsasl-commit |
Subject: |
CVS gsasl/lib/gl |
Date: |
Sun, 28 Nov 2004 04:52:40 +0100 |
Update of /home/cvs/gsasl/lib/gl
In directory dopio:/tmp/cvs-serv2541/gl
Modified Files:
Makefile.am base64.c
Removed Files:
xsize.h
Log Message:
Update.
--- /home/cvs/gsasl/lib/gl/Makefile.am 2004/11/27 02:13:12 1.13
+++ /home/cvs/gsasl/lib/gl/Makefile.am 2004/11/28 03:52:39 1.14
@@ -9,7 +9,7 @@
#
# Generated by gnulib-tool.
# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgl --source-base=gl
--m4-base=gl/m4 --libtool --lgpl base64 dummy gettext stdbool strdup xsize
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgl --source-base=gl
--m4-base=gl/m4 --libtool --lgpl base64 dummy gettext stdbool strdup
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
@@ -64,11 +64,5 @@
## end gnulib module strdup
-## begin gnulib module xsize
-
-libgl_la_SOURCES += xsize.h
-
-## end gnulib module xsize
-
# Makefile.am ends here
--- /home/cvs/gsasl/lib/gl/base64.c 2004/11/27 02:13:12 1.3
+++ /home/cvs/gsasl/lib/gl/base64.c 2004/11/28 03:52:39 1.4
@@ -15,19 +15,26 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* Portions adapted from GNU MailUtils, by Simon Josefsson. For more
- information, see RFC 3548 <http://www.ietf.org/rfc/rfc3548.txt>. */
+/* Written by Simon Josefsson. Partially adapted from GNU MailUtils
+ * (mailbox/filter_trans.c, as of 2004-11-28). Improved by review
+ * from Paul Eggert, Bruno Haible, and Stepan Kasal.
+ *
+ * See also RFC 3548 <http://www.ietf.org/rfc/rfc3548.txt>.
+ */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+/* Get SIZE_MAX. */
+#include <limits.h>
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
/* Get malloc. */
#include <stdlib.h>
-/* Get size_overflow_p etc. */
-#include "xsize.h"
-
/* Get prototype. */
#include "base64.h"
@@ -77,14 +84,31 @@
return, the OUT variable will hold a pointer to newly allocated
memory that must be deallocated by the caller, or NULL on memory
allocation failure. If output length would overflow, SIZE_MAX is
- returned and OUT is undefined. */
+ returned and OUT is set to NULL. If memory allocation fail, OUT is
+ set to NULL, and the return value indicate length of the requested
+ memory block, i.e., BASE64_LENGTH(inlen) + 1. */
size_t
base64_encode_alloc (const char *in, size_t inlen, char **out)
{
- size_t outlen = xsum (1, xtimes (xmax (inlen, inlen + 2) / 3, 4));
+ size_t outlen = 1 + BASE64_LENGTH(inlen);
- if (size_overflow_p (outlen))
- return SIZE_MAX;
+ /* Check for overflow in outlen computation.
+ *
+ * If there is no overflow, outlen >= inlen.
+ *
+ * If the operation (inlen + 2) overflows then it yields at most +1, so
+ * outlen is 0.
+ *
+ * If the multiplication overflows, we lose at least half of the
+ * correct value, so the result is < ((inlen + 2) / 3) * 2, which is
+ * less than (inlen + 2) * 0.66667, which is less than inlen as soon as
+ * (inlen > 4).
+ */
+ if (inlen > outlen)
+ {
+ *out = NULL;
+ return SIZE_MAX;
+ }
*out = malloc (outlen);
if (*out)
@@ -93,56 +117,173 @@
return outlen - 1;
}
+/* With this approach, instead of hard coding the values, this file
+ work independent of the charset used (think EBCDIC). */
+#define B64(x) \
+ ((x) == 'A' ? 0 \
+ : (x) == 'B' ? 1 \
+ : (x) == 'C' ? 2 \
+ : (x) == 'D' ? 3 \
+ : (x) == 'E' ? 4 \
+ : (x) == 'F' ? 5 \
+ : (x) == 'G' ? 6 \
+ : (x) == 'H' ? 7 \
+ : (x) == 'I' ? 8 \
+ : (x) == 'J' ? 9 \
+ : (x) == 'K' ? 10 \
+ : (x) == 'L' ? 11 \
+ : (x) == 'M' ? 12 \
+ : (x) == 'N' ? 13 \
+ : (x) == 'O' ? 14 \
+ : (x) == 'P' ? 15 \
+ : (x) == 'Q' ? 16 \
+ : (x) == 'R' ? 17 \
+ : (x) == 'S' ? 18 \
+ : (x) == 'T' ? 19 \
+ : (x) == 'U' ? 20 \
+ : (x) == 'V' ? 21 \
+ : (x) == 'W' ? 22 \
+ : (x) == 'X' ? 23 \
+ : (x) == 'Y' ? 24 \
+ : (x) == 'Z' ? 25 \
+ : (x) == 'a' ? 26 \
+ : (x) == 'b' ? 27 \
+ : (x) == 'c' ? 28 \
+ : (x) == 'd' ? 29 \
+ : (x) == 'e' ? 30 \
+ : (x) == 'f' ? 31 \
+ : (x) == 'g' ? 32 \
+ : (x) == 'h' ? 33 \
+ : (x) == 'i' ? 34 \
+ : (x) == 'j' ? 35 \
+ : (x) == 'k' ? 36 \
+ : (x) == 'l' ? 37 \
+ : (x) == 'm' ? 38 \
+ : (x) == 'n' ? 39 \
+ : (x) == 'o' ? 40 \
+ : (x) == 'p' ? 41 \
+ : (x) == 'q' ? 42 \
+ : (x) == 'r' ? 43 \
+ : (x) == 's' ? 44 \
+ : (x) == 't' ? 45 \
+ : (x) == 'u' ? 46 \
+ : (x) == 'v' ? 47 \
+ : (x) == 'w' ? 48 \
+ : (x) == 'x' ? 49 \
+ : (x) == 'y' ? 50 \
+ : (x) == 'z' ? 51 \
+ : (x) == '0' ? 52 \
+ : (x) == '1' ? 53 \
+ : (x) == '2' ? 54 \
+ : (x) == '3' ? 55 \
+ : (x) == '4' ? 56 \
+ : (x) == '5' ? 57 \
+ : (x) == '6' ? 58 \
+ : (x) == '7' ? 59 \
+ : (x) == '8' ? 60 \
+ : (x) == '9' ? 61 \
+ : (x) == '+' ? 62 \
+ : (x) == '/' ? 63 \
+ : -1)
+
/* C89 compliant way to cast 'char *' to 'unsigned char *'. */
static inline unsigned char *to_ucharp (char *ch) { return ch; }
/* Decode base64 encoded input array IN of length INLEN to output
array OUT that can hold *OUTLEN bytes. Return true if decoding was
- successful, false otherwise. If *OUTLEN is too small, as many
- bytes as possible will be written to OUT. On return, *OUTLEN holds
- the length of decode bytes in OUT. Note that if any non-alphabet
- characters are encountered, decoding is stopped and false is
- returned. */
+ successful, i.e. if the input was valid base64 data, false
+ otherwise. If *OUTLEN is too small, as many bytes as possible will
+ be written to OUT. On return, *OUTLEN holds the length of decoded
+ bytes in OUT. Note that as soon as any non-alphabet characters are
+ encountered, decoding is stopped and false is returned. */
bool
base64_decode (const char *in, size_t inlen, char *out, size_t * outlen)
{
static const signed char b64[0x100] = {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2, -1, -1, -2, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -3, -1, -1,
- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
- -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+ B64 (0), B64 (1), B64 (2), B64 (3),
+ B64 (4), B64 (5), B64 (6), B64 (7),
+ B64 (8), B64 (9), B64 (10), B64 (11),
+ B64 (12), B64 (13), B64 (14), B64 (15),
+ B64 (16), B64 (17), B64 (18), B64 (19),
+ B64 (20), B64 (21), B64 (22), B64 (23),
+ B64 (24), B64 (25), B64 (26), B64 (27),
+ B64 (28), B64 (29), B64 (30), B64 (31),
+ B64 (32), B64 (33), B64 (34), B64 (35),
+ B64 (36), B64 (37), B64 (38), B64 (39),
+ B64 (40), B64 (41), B64 (42), B64 (43),
+ B64 (44), B64 (45), B64 (46), B64 (47),
+ B64 (48), B64 (49), B64 (50), B64 (51),
+ B64 (52), B64 (53), B64 (54), B64 (55),
+ B64 (56), B64 (57), B64 (58), B64 (59),
+ B64 (60), B64 (61), B64 (62), B64 (63),
+ B64 (64), B64 (65), B64 (66), B64 (67),
+ B64 (68), B64 (69), B64 (70), B64 (71),
+ B64 (72), B64 (73), B64 (74), B64 (75),
+ B64 (76), B64 (77), B64 (78), B64 (79),
+ B64 (80), B64 (81), B64 (82), B64 (83),
+ B64 (84), B64 (85), B64 (86), B64 (87),
+ B64 (88), B64 (89), B64 (90), B64 (91),
+ B64 (92), B64 (93), B64 (94), B64 (95),
+ B64 (96), B64 (97), B64 (98), B64 (99),
+ B64 (100), B64 (101), B64 (102), B64 (103),
+ B64 (104), B64 (105), B64 (106), B64 (107),
+ B64 (108), B64 (109), B64 (110), B64 (111),
+ B64 (112), B64 (113), B64 (114), B64 (115),
+ B64 (116), B64 (117), B64 (118), B64 (119),
+ B64 (120), B64 (121), B64 (122), B64 (123),
+ B64 (124), B64 (125), B64 (126), B64 (127),
+ B64 (128), B64 (129), B64 (130), B64 (131),
+ B64 (132), B64 (133), B64 (134), B64 (135),
+ B64 (136), B64 (137), B64 (138), B64 (139),
+ B64 (140), B64 (141), B64 (142), B64 (143),
+ B64 (144), B64 (145), B64 (146), B64 (147),
+ B64 (148), B64 (149), B64 (150), B64 (151),
+ B64 (152), B64 (153), B64 (154), B64 (155),
+ B64 (156), B64 (157), B64 (158), B64 (159),
+ B64 (160), B64 (161), B64 (162), B64 (163),
+ B64 (164), B64 (165), B64 (166), B64 (167),
+ B64 (168), B64 (169), B64 (170), B64 (171),
+ B64 (172), B64 (173), B64 (174), B64 (175),
+ B64 (176), B64 (177), B64 (178), B64 (179),
+ B64 (180), B64 (181), B64 (182), B64 (183),
+ B64 (184), B64 (185), B64 (186), B64 (187),
+ B64 (188), B64 (189), B64 (190), B64 (191),
+ B64 (192), B64 (193), B64 (194), B64 (195),
+ B64 (196), B64 (197), B64 (198), B64 (199),
+ B64 (200), B64 (201), B64 (202), B64 (203),
+ B64 (204), B64 (205), B64 (206), B64 (207),
+ B64 (208), B64 (209), B64 (210), B64 (211),
+ B64 (212), B64 (213), B64 (214), B64 (215),
+ B64 (216), B64 (217), B64 (218), B64 (219),
+ B64 (220), B64 (221), B64 (222), B64 (223),
+ B64 (224), B64 (225), B64 (226), B64 (227),
+ B64 (228), B64 (229), B64 (230), B64 (231),
+ B64 (232), B64 (233), B64 (234), B64 (235),
+ B64 (236), B64 (237), B64 (238), B64 (239),
+ B64 (240), B64 (241), B64 (242), B64 (243),
+ B64 (244), B64 (245), B64 (246), B64 (247),
+ B64 (248), B64 (249), B64 (250), B64 (251),
+ B64 (252), B64 (253), B64 (254), B64 (255)
};
const unsigned char *iptr = to_cucharp (in);
unsigned char *optr = to_ucharp (out);
- size_t len = *outlen;
+ size_t outleft = *outlen;
- *outlen = 0;
+ if (outlen)
+ *outlen = 0;
- while (inlen >= 2)
+ while (inlen >= 4)
{
- if (!len--)
- return true;
-
if (b64[iptr[0]] < 0 || b64[iptr[1]] < 0)
return false;
- *optr++ = (b64[iptr[0]] << 2) | (b64[iptr[1]] >> 4);
- (*outlen)++;
-
- if (inlen == 2)
- return false;
+ if (outleft)
+ {
+ *optr++ = (b64[iptr[0]] << 2) | (b64[iptr[1]] >> 4);
+ if (outlen)
+ (*outlen)++;
+ outleft--;
+ }
if (iptr[2] == '=')
{
@@ -154,17 +295,16 @@
}
else
{
- if (!len--)
- return true;
-
if (b64[iptr[2]] < 0)
return false;
- *optr++ = ((b64[iptr[1]] << 4) & 0xf0) | (b64[iptr[2]] >> 2);
- (*outlen)++;
-
- if (inlen == 3)
- return false;
+ if (outleft)
+ {
+ *optr++ = ((b64[iptr[1]] << 4) & 0xf0) | (b64[iptr[2]] >> 2);
+ if (outlen)
+ (*outlen)++;
+ outleft--;
+ }
if (iptr[3] == '=')
{
@@ -173,14 +313,16 @@
}
else
{
- if (!len--)
- return true;
-
if (b64[iptr[3]] < 0)
return false;
- *optr++ = ((b64[iptr[2]] << 6) & 0xc0) | b64[iptr[3]];
- (*outlen)++;
+ if (outleft)
+ {
+ *optr++ = ((b64[iptr[2]] << 6) & 0xc0) | b64[iptr[3]];
+ if (outlen)
+ (*outlen)++;
+ outleft--;
+ }
}
}
iptr += 4;
@@ -194,27 +336,48 @@
}
-/* Allocate an output buffer OUT, and decode the base64 encoded data
- stored in IN of size INLEN. On return, the actual size of the
- decoded data is stored in *OUTLEN. The function return true if
- decoding was successful, or false on memory allocation, integer
- overflow or decoding errors. */
+/* Allocate an output buffer in *OUT, and decode the base64 encoded
+ data stored in IN of size INLEN to the *OUT buffer. On return, the
+ size of the decoded data is stored in *OUTLEN. OUTLEN may be NULL,
+ if the caller is not interested in the decoded length. *OUT may be
+ NULL to indicate an out of memory error, in which case *OUTLEN
+ contain the size of the memory block needed. *OUTLEN may be
+ SIZE_MAX if INLEN is too large, in which case *OUT is also NULL.
+ The function return true on successful decoding, memory errors and
+ overflow errors. (Use the *OUT and *OUTLEN parameters to
+ differentiate between successful decoding and memory/overflow
+ errors.) The function return false if the input was invalid, in
+ which case *OUT is NULL and *OUTLEN is undefined. */
bool
base64_decode_alloc (const char *in, size_t inlen, char **out,
size_t * outlen)
{
+ size_t needlen;
- size_t len = xtimes (inlen, 3);
-
- if (size_overflow_p (len))
- return false;
+ if (inlen >= SIZE_MAX / 3)
+ {
+ *out = NULL;
+ if (outlen)
+ *outlen = SIZE_MAX;
+ return true;
+ }
- *outlen = len / 4; /* FIXME: May allocate one 1 or 2 bytes too
- much, depending on input. */
+ needlen = 3 * inlen / 4; /* FIXME: May allocate one 1 or 2 bytes too
+ much, depending on input. */
*out = malloc (*outlen);
if (!*out)
- return false;
+ return true;
- return base64_decode (in, inlen, *out, outlen);
+ if (!base64_decode (in, inlen, *out, &needlen))
+ {
+ free (out);
+ *out = NULL;
+ return false;
+ }
+
+ if (*outlen)
+ *outlen = needlen;
+
+ return true;
}
- CVS gsasl/lib/gl, gsasl-commit, 2004/11/25
- CVS gsasl/lib/gl, gsasl-commit, 2004/11/25
- CVS gsasl/lib/gl, gsasl-commit, 2004/11/26
- CVS gsasl/lib/gl,
gsasl-commit <=
- CVS gsasl/lib/gl, gsasl-commit, 2004/11/27
- CVS gsasl/lib/gl, gsasl-commit, 2004/11/28
- CVS gsasl/lib/gl, gsasl-commit, 2004/11/28
- CVS gsasl/lib/gl, gsasl-commit, 2004/11/29
- CVS gsasl/lib/gl, gsasl-commit, 2004/11/29
- CVS gsasl/lib/gl, gsasl-commit, 2004/11/30
- CVS gsasl/lib/gl, gsasl-commit, 2004/11/30