[svn] GnuPG - r4255 - trunk/keyserver

[svn author wk]

Author: wk
Date: 2006-09-19 16:53:30 +0200 (Tue, 19 Sep 2006)
New Revision: 4255

Added:
   trunk/keyserver/no-libgcrypt.c
Modified:
   trunk/keyserver/ChangeLog
   trunk/keyserver/Makefile.am
Log:
Added stub library


Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2006-09-18 14:08:27 UTC (rev 4254)
+++ trunk/keyserver/ChangeLog	2006-09-19 14:53:30 UTC (rev 4255)
@@ -1,3 +1,8 @@
+2006-09-19  Werner Koch  <wk at g10code.com>
+	
+	* no-libgcrypt.c: New. Taken from ../tools.
+	* Makefile.am: Add no-libgcrypt to all sources.
+
 2006-09-06  Marcus Brinkmann  <marcus at g10code.de>
 
 	* Makefile.am (AM_CFLAGS): Add $(GPG_ERROR_CFLAGS).

Modified: trunk/keyserver/Makefile.am
===================================================================
--- trunk/keyserver/Makefile.am	2006-09-18 14:08:27 UTC (rev 4254)
+++ trunk/keyserver/Makefile.am	2006-09-19 14:53:30 UTC (rev 4255)
@@ -35,10 +35,10 @@
 needed_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a
 other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
 
-gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h
-gpg2keys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h
-gpg2keys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h
-gpg2keys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h
+gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c
+gpg2keys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h no-libgcrypt.c
+gpg2keys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h no-libgcrypt.c
+gpg2keys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h no-libgcrypt.c
 
 
 gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)

Added: trunk/keyserver/no-libgcrypt.c
===================================================================
--- trunk/keyserver/no-libgcrypt.c	2006-09-18 14:08:27 UTC (rev 4254)
+++ trunk/keyserver/no-libgcrypt.c	2006-09-19 14:53:30 UTC (rev 4255)
@@ -0,0 +1,113 @@
+/* no-libgcrypt.c - Replacement functions for libgcrypt.
+ *	Copyright (C) 2003 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 <string.h>
+#include <errno.h>
+
+#include "../common/util.h"
+#include "i18n.h"
+
+
+/* Replace libgcrypt's malloc functions which are used by
+   ../jnlib/libjnlib.a .  ../common/util.h defines macros to map them
+   to xmalloc etc. */
+static void
+out_of_memory (void)
+{
+  fprintf (stderr, "error allocating enough memory: %s\n", strerror (errno));
+  exit (2);
+}
+
+
+void *
+gcry_malloc (size_t n)
+{
+  return malloc (n);
+}
+
+void *
+gcry_xmalloc (size_t n)
+{
+  void *p = malloc (n);
+  if (!p)
+    out_of_memory ();
+  return p;
+}
+
+char *
+gcry_strdup (const char *string)
+{
+  return malloc (strlen (string)+1);
+}
+
+
+void *
+gcry_realloc (void *a, size_t n)
+{
+  return realloc (a, n);
+}
+
+void *
+gcry_xrealloc (void *a, size_t n)
+{
+  void *p = realloc (a, n);
+  if (!p)
+    out_of_memory ();
+  return p;
+}
+
+
+
+void *
+gcry_calloc (size_t n, size_t m)
+{
+  return calloc (n, m);
+}
+
+void *
+gcry_xcalloc (size_t n, size_t m)
+{
+  void *p = calloc (n, m);
+  if (!p)
+    out_of_memory ();
+  return p;
+}
+
+
+char *
+gcry_xstrdup (const char *string)
+{
+  void *p = malloc (strlen (string)+1);
+  if (!p)
+    out_of_memory ();
+  strcpy( p, string );
+  return p;
+}
+
+void
+gcry_free (void *a)
+{
+  if (a)
+    free (a);
+}