aboutsummaryrefslogtreecommitdiffstats
path: root/cipher
diff options
context:
space:
mode:
Diffstat (limited to 'cipher')
-rw-r--r--cipher/g10c.c6
-rw-r--r--cipher/rndlinux.c8
-rw-r--r--cipher/rndunix.c2
3 files changed, 9 insertions, 7 deletions
diff --git a/cipher/g10c.c b/cipher/g10c.c
index 718520057..de6a09c96 100644
--- a/cipher/g10c.c
+++ b/cipher/g10c.c
@@ -24,8 +24,10 @@
#include "mpi.h"
#include "random.h"
#include "cipher.h"
-#define _g10lib_INTERNAL 1
-#include "g10lib.h"
+
+
+/* FIXME: The modules should use functions from libgcrypt */
+
const char *g10c_revision_string(int dummy) { return "$Revision$"; }
diff --git a/cipher/rndlinux.c b/cipher/rndlinux.c
index 66bb34e62..a1a1c294c 100644
--- a/cipher/rndlinux.c
+++ b/cipher/rndlinux.c
@@ -34,14 +34,14 @@
#include <unistd.h>
#include <fcntl.h>
#include "types.h"
+#include "util.h"
+#include "ttyio.h"
+#include "dynload.h"
+
#ifdef IS_MODULE
- #include "g10lib.h"
#define _(a) (a)
#else
- #include "util.h"
- #include "ttyio.h"
#include "i18n.h"
- #include "dynload.h"
#endif
static int open_device( const char *name, int minor );
diff --git a/cipher/rndunix.c b/cipher/rndunix.c
index b7381a55c..71f75dfc2 100644
--- a/cipher/rndunix.c
+++ b/cipher/rndunix.c
@@ -53,10 +53,10 @@
#include <errno.h>
#include "types.h" /* for byte and u32 typedefs */
-#include "g10lib.h"
#ifndef IS_MODULE
#include "dynload.h"
#endif
+#include "util.h"
#ifndef EAGAIN
#define EAGAIN EWOULDBLOCK