Allow for a global trustlist.

5 files changed, 368 insertions, 0 deletions

diff --git a/common/ChangeLog b/common/ChangeLog
index e24250c17..8be1ce5c2 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-15  Werner Koch  <wk@g10code.com>
+
+	* convert.c: New.
+	(hexcolon2bin): New.
+	(bin2hex, bin2hexcolon, do_binhex): New.
+	* t-convert.c: New
+
 2006-09-14  Werner Koch  <wk@g10code.com>
 
 	* util.h (out_of_core): Use new gpg_error_from_syserror function.
diff --git a/common/Makefile.am b/common/Makefile.am
index d6143de67..28d396490 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -21,6 +21,8 @@
 ## Process this file with automake to produce Makefile.in
 
 noinst_LIBRARIES = libcommon.a libsimple-pwquery.a
+noinst_PROGRAMS = $(module_tests)
+TESTS = $(module_tests)
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl
 
@@ -39,6 +41,7 @@ libcommon_a_SOURCES = \
 	gettime.c \
 	yesno.c \
 	b64enc.c \
+	convert.c \
 	miscellaneous.c \
 	xasprintf.c \
 	xreadline.c \
@@ -60,3 +63,15 @@ libcommon_a_SOURCES = \
 libsimple_pwquery_a_SOURCES = \
 	simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
 
+
+#
+# Module tests
+#
+module_tests = t-convert
+
+t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
+                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
+
+t_convert_DEPENDENCIES = convert.c
+t_convert_LDADD = $(t_common_ldadd)
+
diff --git a/common/convert.c b/common/convert.c
new file mode 100644
index 000000000..66f612063
--- /dev/null
+++ b/common/convert.c
@@ -0,0 +1,136 @@
+/* convert.c - Hex conversion functions.
+ *	Copyright (C) 2006 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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.
+ *
+ * GnuPG 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
+#include <config.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "util.h"
+
+
+#define tohex(n) ((n) < 10 ? ((n) + '0') : (((n) - 10) + 'A'))
+
+
+/* Convert STRING consisting of hex characters into its binary representation
+   and store that at BUFFER.  BUFFER needs to be of LENGTH bytes.  The
+   function check that the STRING will convert exactly to LENGTH
+   bytes. Colons inbetween the hex digits are allowed, if one colon
+   has been given a colon is expected very 2 characters. The string
+   is delimited by either end of string or a white space character.
+   The function returns -1 on error or the length of the parsed
+   string.  */
+int
+hexcolon2bin (const char *string, void *buffer, size_t length)
+{
+  int i;
+  const char *s = string;
+  int need_colon = 0;
+
+  for (i=0; i < length; )
+    {
+      if (i==1 && *s == ':')  /* Skip colons between hex digits.  */
+        {
+          need_colon = 1;
+          s++;
+        }
+      else if (need_colon && *s == ':')
+        s++;
+      else if (need_colon)
+        return -1;           /* Colon expected. */
+      if (!hexdigitp (s) || !hexdigitp (s+1))
+        return -1;           /* Invalid hex digits. */
+      ((unsigned char*)buffer)[i++] = xtoi_2 (s);
+      s += 2;
+    }
+  if (*s == ':')
+    return -1;             /* Trailing colons are not allowed.  */
+  if (*s && (!isascii (*s) || !isspace (*s)) )
+    return -1;             /* Not followed by Nul or white space.  */
+  if (i != length)
+    return -1;             /* Not of expected length.  */
+  if (*s)
+    s++; /* Skip the delimiter. */
+  return s - string;
+}
+
+
+
+static char *
+do_bin2hex (const void *buffer, size_t length, char *stringbuf, int with_colon)
+{
+  const unsigned char *s;
+  char *p;
+  
+  if (!stringbuf)
+    {
+      /* Not really correct for with_colon but we don't care about the
+         one wasted byte. */
+      size_t n = with_colon? 3:2; 
+      size_t nbytes = n * length + 1; 
+      if (length &&  (nbytes-1) / n != length) 
+        {
+          errno = ENOMEM;
+          return NULL;
+        }
+      stringbuf = xtrymalloc (nbytes);
+      if (!stringbuf)
+        return NULL;
+    }
+  
+  for (s = buffer, p = stringbuf; length; length--, s++)
+    {
+      if (with_colon && s != buffer)
+        *p++ = ':';
+      *p++ = tohex ((*s>>4)&15);
+      *p++ = tohex (*s&15);
+    }
+  *p = 0;
+
+  return stringbuf;
+}
+
+
+/* Convert LENGTH bytes of data in BUFFER into hex encoding and store
+   that at the provided STRINGBUF.  STRINGBUF must be allocated of at
+   least (2*LENGTH+1) bytes or be NULL so that the function mallocs an
+   appropriate buffer.  Returns STRINGBUF or NULL on error (which may
+   only occur if STRINGBUF has been NULL and the internal malloc
+   failed). */
+char *
+bin2hex (const void *buffer, size_t length, char *stringbuf)
+{
+  return do_bin2hex (buffer, length, stringbuf, 0);
+}
+
+/* Convert LENGTH bytes of data in BUFFER into hex encoding and store
+   that at the provided STRINGBUF.  STRINGBUF must be allocated of at
+   least (3*LENGTH+1) bytes or be NULL so that the function mallocs an
+   appropriate buffer.  Returns STRINGBUF or NULL on error (which may
+   only occur if STRINGBUF has been NULL and the internal malloc
+   failed). */
+char *
+bin2hexcolon (const void *buffer, size_t length, char *stringbuf)
+{
+  return do_bin2hex (buffer, length, stringbuf, 1);
+}
+
+
diff --git a/common/t-convert.c b/common/t-convert.c
new file mode 100644
index 000000000..52647b085
--- /dev/null
+++ b/common/t-convert.c
@@ -0,0 +1,204 @@
+/* t-convert.c - Module test for convert.c
+ *	Copyright (C) 2006 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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.
+ *
+ * GnuPG 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "util.h"
+
+#define pass()  do { ; } while(0)
+#define fail(a)  do { fprintf (stderr, "%s:%d: test %d failed\n",\
+                               __FILE__,__LINE__, (a));          \
+                     exit (1);                                   \
+                   } while(0)
+
+
+static void
+test_hexcolon2bin (void)
+{
+  static const char *valid[] = {
+    "00112233445566778899aabbccddeeff11223344",
+    "00112233445566778899AABBCCDDEEFF11223344",
+    "00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:11:22:33:44",
+    "00112233445566778899AABBCCDDEEFF11223344 blah",
+    "00112233445566778899AABBCCDDEEFF11223344\tblah",
+    "00112233445566778899AABBCCDDEEFF11223344\nblah",
+    NULL
+  };
+  static const char *invalid[] = {
+    "00112233445566778899aabbccddeeff1122334",
+    "00112233445566778899AABBCCDDEEFF1122334",
+    "00112233445566778899AABBCCDDEEFG11223344",
+    ":00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:11:22:33:44",
+    "00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:11:22:33:44:",
+    "00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:11:22:3344",
+    "00:1122:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:11:22:33:44",
+    "0011:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:11:22:33:44",
+    "00 11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:11:22:33:44",
+    "00:11 22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:11:22:33:44",
+    "00112233445566778899aabbccddeeff112233445",
+    "00112233445566778899aabbccddeeff1122334455",
+    "00112233445566778899aabbccddeeff11223344blah",
+    NULL
+  };
+  static const char *valid2[] = {
+    "00",
+    "00 x",
+    NULL
+  };
+  static const char *invalid2[] = {
+    "",
+    "0",
+    "00:",
+    ":00",
+    "0:0",
+    "00x",
+    " 00",
+    NULL
+  };
+  unsigned char buffer[20];
+  int len;
+  int i;
+  
+  
+  for (i=0; valid[i]; i++)
+    {
+      len = hexcolon2bin (valid[i], buffer, sizeof buffer);
+      if (len < 0)
+        fail (i);
+      if (memcmp (buffer, ("\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa"
+                           "\xbb\xcc\xdd\xee\xff\x11\x22\x33\x44"), 20))
+          fail (i);
+    }
+  if (hexcolon2bin (valid[0], buffer, sizeof buffer) != 40)
+    fail (0);
+  if (hexcolon2bin (valid[3], buffer, sizeof buffer) != 41)
+    fail (0);
+  
+  for (i=0; invalid[i]; i++)
+    {
+      len = hexcolon2bin (invalid[i], buffer, sizeof buffer);
+      if (!(len < 0))
+        fail (i);
+    }
+
+  for (i=0; valid2[i]; i++)
+    {
+      len = hexcolon2bin (valid2[i], buffer, 1);
+      if (len < 0)
+        fail (i);
+      if (memcmp (buffer, "\x00", 1))
+        fail (i);
+    }
+  if (hexcolon2bin (valid2[0], buffer, 1) != 2)
+    fail (0);
+  if (hexcolon2bin (valid2[1], buffer, 1) != 3)
+    fail (0);
+  
+  for (i=0; invalid2[i]; i++)
+    {
+      len = hexcolon2bin (invalid2[i], buffer, 1);
+      if (!(len < 0))
+        fail (i);
+    }
+
+
+}
+
+
+
+static void
+test_bin2hex (void)
+{
+  char stuff[20+1] = ("\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa"
+                      "\xbb\xcc\xdd\xee\xff\x01\x10\x02\xa3");
+  char hexstuff[] = "00112233445566778899AABBCCDDEEFF011002A3";
+  char buffer[2*20+1];
+  char *p;
+
+  p = bin2hex (stuff, 20, buffer);
+  if (!p)
+    fail (0);
+  if (p != buffer)
+    fail (0);
+  if (strcmp (buffer, hexstuff))
+    fail (0);
+
+  p = bin2hex (stuff, 20, NULL);
+  if (!p)
+    fail (0);
+  if (strcmp (p, hexstuff))
+    fail (0);
+  
+  p = bin2hex (stuff, (size_t)(-1), NULL);
+  if (p)
+    fail (0); 
+  if (errno != ENOMEM)
+    fail (1);
+}
+
+
+static void
+test_bin2hexcolon (void)
+{
+  char stuff[20+1] = ("\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa"
+                      "\xbb\xcc\xdd\xee\xff\x01\x10\x02\xa3");
+  char hexstuff[] = ("00:11:22:33:44:55:66:77:88:99:AA:BB:CC:DD:EE:FF"
+                     ":01:10:02:A3");
+  char buffer[3*20+1];
+  char *p;
+
+  p = bin2hexcolon (stuff, 20, buffer);
+  if (!p)
+    fail (0);
+  if (p != buffer)
+    fail (0);
+  if (strcmp (buffer, hexstuff))
+    fail (0);
+
+  p = bin2hexcolon (stuff, 20, NULL);
+  if (!p)
+    fail (0); 
+  if (strcmp (p, hexstuff))
+    fail (0);
+  
+  p = bin2hexcolon (stuff, (size_t)(-1), NULL);
+  if (p)
+    fail (0); 
+  if (errno != ENOMEM)
+    fail (1);
+}
+
+
+
+
+int
+main (int argc, char **argv)
+{
+  
+  test_hexcolon2bin ();
+  test_bin2hex ();
+  test_bin2hexcolon ();
+
+  return 0;
+}
+
diff --git a/common/util.h b/common/util.h
index 92b88aa8d..da1e098cb 100644
--- a/common/util.h
+++ b/common/util.h
@@ -144,6 +144,12 @@ int cmp_simple_canon_sexp (const unsigned char *a, const unsigned char *b);
 unsigned char *make_simple_sexp_from_hexstr (const char *line,
                                              size_t *nscanned);
 
+/*-- convert.c --*/
+int hexcolon2bin (const char *string, void *buffer, size_t length);
+char *bin2hex (const void *buffer, size_t length, char *stringbuf);
+char *bin2hexcolon (const void *buffer, size_t length, char *stringbuf);
+
+
 /*-- homedir.c --*/
 const char *default_homedir (void);