[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS shishi/gl
|
From: |
shishi-commit |
|
Subject: |
CVS shishi/gl |
|
Date: |
Thu, 02 Dec 2004 02:37:51 +0100 |
Update of /home/cvs/shishi/gl
In directory dopio:/tmp/cvs-serv2857/gl
Modified Files:
Makefile.am base64.c base64.h
Log Message:
Add base64 gnulib module.
--- /home/cvs/shishi/gl/Makefile.am 2004/11/11 18:59:35 1.50
+++ /home/cvs/shishi/gl/Makefile.am 2004/12/02 01:37:50 1.51
@@ -9,7 +9,7 @@
#
# Generated by gnulib-tool.
# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl
--m4-base=gl/m4 --libtool alloca alloca-opt allocsa error extensions
getaddrinfo getdate getdomainname gethostname getline getopt getpass getsubopt
gettext gettime gettimeofday mktime progname readlink realloc restrict setenv
stdbool strcase strchrnul strdup strndup strnlen strtok_r timegm time_r
timespec vasnprintf vasprintf xalloc xgetdomainname xgethostname xreadlink
xsize xstrndup
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl
--m4-base=gl/m4 --libtool alloca alloca-opt allocsa base64 error extensions
getaddrinfo getdate getdomainname gethostname getline getopt getpass getsubopt
gettext gettime gettimeofday mktime progname readlink realloc restrict setenv
stdbool strcase strchrnul strdup strndup strnlen strtok_r timegm time_r
timespec vasnprintf vasprintf xalloc xgetdomainname xgethostname xreadlink
xsize xstrndup
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
@@ -63,6 +63,12 @@
## end gnulib module allocsa
+## begin gnulib module base64
+
+libgnu_la_SOURCES += base64.h base64.c
+
+## end gnulib module base64
+
## begin gnulib module getaddrinfo
libgnu_la_SOURCES += getaddrinfo.h
@@ -256,5 +262,4 @@
# Makefile.am ends here
libgnu_la_LIBADD += @LIB_CLOCK_GETTIME@
-libgnu_la_SOURCES += base64.c base64.h
EXTRA_DIST += README
--- /home/cvs/shishi/gl/base64.c 2003/08/28 12:29:20 1.2
+++ /home/cvs/shishi/gl/base64.c 2004/12/02 01:37:50 1.3
@@ -1,140 +1,403 @@
-/* base64.c base64 encoding and decoding functions
- * Copyright (C) 2002, 2003 Simon Josefsson
+/* base64.c -- Encode binary data using printable characters.
+ Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+
+ 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. */
+
+/* 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.
*
- * This file is part of Shishi.
+ * See also RFC 3548 <http://www.ietf.org/rfc/rfc3548.txt>.
*
- * Shishi 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 of the License, or
- * (at your option) any later version.
+ * Be careful with error checking. Here is how you would typically
+ * use these functions:
*
- * Shishi 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.
+ * bool ok = base64_decode_alloc (in, inlen, &out, &outlen);
+ * if (!ok)
+ * FAIL: input was not valid base64
+ * if (out == NULL)
+ * FAIL: memory allocation error
+ * OK: data in OUT/OUTLEN
*
- * You should have received a copy of the GNU General Public License
- * along with Shishi; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * size_t outlen = base64_encode_alloc (in, inlen, &out);
+ * if (out == NULL && outlen == 0 && inlen != 0)
+ * FAIL: input too long
+ * if (out == NULL)
+ * FAIL: memory allocation error
+ * OK: data in OUT/LEN.
*
*/
-/*
- * This code is heavily modified from fetchmail (also GPL'd, of
- * course) by Brendan Cully <address@hidden>, via Mutt.
- *
- * Original copyright notice:
- *
- * The code in the fetchmail distribution is Copyright 1997 by Eric
- * S. Raymond. Portions are also copyrighted by Carl Harris, 1993
- * and 1995. Copyright retained for the purpose of protecting free
- * redistribution of source.
- *
- */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
-#include <string.h>
-#include <ctype.h>
+/* Get prototype. */
#include "base64.h"
-static char B64Chars[64] = {
- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
- 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
- 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
- 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', '+', '/'
-};
-
-#define BAD -1
+/* Get malloc. */
+#include <stdlib.h>
-static const char base64val[] = {
- BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD,
- BAD,
- BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD,
- BAD,
- BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, 62, BAD, BAD, BAD,
- 63,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, BAD, BAD, BAD, BAD, BAD, BAD,
- BAD, 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, BAD, BAD, BAD, BAD, BAD,
- BAD, 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, BAD, BAD, BAD, BAD, BAD
-};
-
-#define base64val(c) B64Chars[(unsigned int)(c)]
-
-#define DECODE64(c) (isascii(c) ? base64val[c] : BAD)
+/* C89 compliant way to cast 'char' to 'unsigned char'. */
+static inline unsigned char
+to_uchar (char ch)
+{
+ return ch;
+}
-/* raw bytes to null-terminated base 64 string */
+/* Base64 encode IN array of size INLEN into OUT array of size OUTLEN.
+ If OUTLEN is less than BASE64_LENGTH(INLEN), write as many bytes as
+ possible. If OUTLEN is larger than BASE64_LENGTH(INLEN), also zero
+ terminate the output buffer. */
void
-base64_to (unsigned char *out, const unsigned char *in, int len, int olen)
+base64_encode (const char *restrict in, size_t inlen,
+ char *restrict out, size_t outlen)
{
- while (len >= 3 && olen > 10)
+ const char b64[64] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+ while (inlen && outlen)
{
- *out++ = B64Chars[in[0] >> 2];
- *out++ = B64Chars[((in[0] << 4) & 0x30) | (in[1] >> 4)];
- *out++ = B64Chars[((in[1] << 2) & 0x3c) | (in[2] >> 6)];
- *out++ = B64Chars[in[2] & 0x3f];
- olen -= 4;
- len -= 3;
+ *out++ = b64[to_uchar (in[0]) >> 2];
+ if (!--outlen)
+ break;
+ *out++ = b64[((to_uchar (in[0]) << 4)
+ + (--inlen ? to_uchar (in[1]) >> 4 : 0)) & 0x3f];
+ if (!--outlen)
+ break;
+ *out++ =
+ (inlen
+ ? b64[((to_uchar (in[1]) << 2)
+ + (--inlen ? to_uchar (in[2]) >> 6 : 0)) & 0x3f] : '=');
+ if (!--outlen)
+ break;
+ *out++ = inlen ? b64[to_uchar (in[2]) & 0x3f] : '=';
+ if (!--outlen)
+ break;
+ if (inlen)
+ inlen--;
in += 3;
}
- /* clean up remainder */
- if (len > 0 && olen > 4)
- {
- unsigned char fragment;
+ if (outlen)
+ *out = '\0';
+}
+
+/* Allocate a buffer and store zero terminated base64 encoded data
+ from array IN of size INLEN, returning BASE64_LENGTH(INLEN), i.e.,
+ the length of the encoded data, excluding the terminating zero. On
+ return, the OUT variable will hold a pointer to newly allocated
+ memory that must be deallocated by the caller. If output string
+ length would overflow, 0 is 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 = 1 + BASE64_LENGTH (inlen);
- *out++ = B64Chars[in[0] >> 2];
- fragment = (in[0] << 4) & 0x30;
- if (len > 1)
- fragment |= in[1] >> 4;
- *out++ = B64Chars[fragment];
- *out++ = (len < 2) ? '=' : B64Chars[(in[1] << 2) & 0x3c];
- *out++ = '=';
+ /* 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 0;
}
- *out = '\0';
+
+ *out = malloc (outlen);
+ if (*out)
+ base64_encode (in, inlen, *out, outlen);
+
+ return outlen - 1;
}
-/* Convert '\0'-terminated base 64 string to raw bytes.
- * Returns length of returned buffer, or -1 on error */
-int
-base64_from (unsigned char *out, const unsigned char *in)
+/* With this approach this file works independent of the charset used
+ (think EBCDIC). However, it does assume that the characters in the
+ Base64 alphabet (A-Za-z0-9+/) are encoded in 0..255. POSIX
+ 1003.1-2001 require that char and unsigned char are 8-bit
+ quantities, though, taking care of that problem. But this may be a
+ potential problem on non-POSIX C99 platforms. */
+#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)
+
+static const signed char b64[0x100] = {
+ 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)
+};
+
+static inline bool
+isb64 (unsigned char ch)
+{
+ return ch <= 255 && 0 <= b64[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, 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 *restrict in, size_t inlen,
+ char *restrict out, size_t * outlen)
{
- int len = 0;
- register unsigned char digit1, digit2, digit3, digit4;
+ size_t outleft = *outlen;
- do
+ while (inlen >= 2)
{
- digit1 = in[0];
- if (digit1 > 127 || DECODE64 (digit1) == BAD)
- return -1;
- digit2 = in[1];
- if (digit2 > 127 || DECODE64 (digit2) == BAD)
- return -1;
- digit3 = in[2];
- if (digit3 > 127 || ((digit3 != '=') && (DECODE64 (digit3) == BAD)))
- return -1;
- digit4 = in[3];
- if (digit4 > 127 || ((digit4 != '=') && (DECODE64 (digit4) == BAD)))
- return -1;
- in += 4;
+ if (!isb64 (in[0]) || !isb64 (in[1]))
+ break;
+
+ if (outleft)
+ {
[113 lines skipped]
--- /home/cvs/shishi/gl/base64.h 2003/08/27 12:44:27 1.1
+++ /home/cvs/shishi/gl/base64.h 2004/12/02 01:37:50 1.2
@@ -1,25 +1,43 @@
-/* base64.h base64 encoding and decoding functions
- * Copyright (C) 2003 Simon Josefsson
- *
- * This file is part of Shishi.
- *
- * Shishi 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 of the License, or
- * (at your option) any later version.
- *
- * Shishi 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 Shishi; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
+/* base64.h -- Encode binary data using printable characters.
+ Copyright (C) 2004 Free Software Foundation, Inc.
+ Written by Simon Josefsson.
-extern void base64_to (unsigned char *out, const unsigned char *in,
- int len, int olen);
+ 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.
-extern int base64_from (unsigned char *out, const unsigned char *in);
+ 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. */
+
+#ifndef BASE64_H
+# define BASE64_H
+
+/* Get size_t. */
+#include <stddef.h>
+
+/* Get bool. */
+#include <stdbool.h>
+
+/* This uses that the expression (n+(k-1))/k means the smallest
+ integer >= n/k, i.e., the ceiling of n/k. */
+#define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4)
+
+extern void base64_encode (const char *restrict in, size_t inlen,
+ char *restrict out, size_t outlen);
+
+extern size_t base64_encode_alloc (const char *in, size_t inlen, char **out);
+
+extern bool base64_decode (const char *restrict in, size_t inlen,
+ char *restrict out, size_t * outlen);
+
+extern bool base64_decode_alloc (const char *in, size_t inlen,
+ char **out, size_t * outlen);
+
+#endif /* BASE64_H */
- CVS shishi/gl,
shishi-commit <=
- CVS shishi/gl, shishi-commit, 2004/12/01
- CVS shishi/gl, shishi-commit, 2004/12/01
- CVS shishi/gl, shishi-commit, 2004/12/01
- CVS shishi/gl, shishi-commit, 2004/12/17
- CVS shishi/gl, shishi-commit, 2004/12/18
- CVS shishi/gl, shishi-commit, 2004/12/18
- CVS shishi/gl, shishi-commit, 2004/12/19
- CVS shishi/gl, shishi-commit, 2004/12/24