summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2004-09-21 13:08:23 +0000
committerSimon Josefsson <simon@josefsson.org>2004-09-21 13:08:23 +0000
commit1f84fe6d59a14e6fc9a6175a589aea031a533978 (patch)
treed7fe966629b8516b6835eeb7dbe79d67309c820c
parentc13d9ce9fec7b1f9392af720d16ef6a47c97991b (diff)
downloadgnutls-1f84fe6d59a14e6fc9a6175a589aea031a533978.tar.gz
Use gnulib getpass in opencdk.
-rw-r--r--libextra/Makefile.am2
-rw-r--r--libextra/opencdk/main.c10
2 files changed, 2 insertions, 10 deletions
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 8016f7b344..9f1698328e 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -72,7 +72,7 @@ libgnutls_extra_la_LDFLAGS = $(libgnutls_extra_version_script_cmd) \
libgnutls_extra_la_SOURCES = $(COBJECTS_EXTRA) $(LZO_OBJECTS) \
$(PGP_COBJECTS) $(OPENCDK_COBJECTS)
-libgnutls_extra_la_LIBADD = ../lib/libgnutls.la
+libgnutls_extra_la_LIBADD = ../lib/libgnutls.la ../gl/libgnu.la
gnutls-extra-api.texi: $(COBJECTS_EXTRA)
diff --git a/libextra/opencdk/main.c b/libextra/opencdk/main.c
index ac66c1c3d2..b4f5c666f7 100644
--- a/libextra/opencdk/main.c
+++ b/libextra/opencdk/main.c
@@ -336,15 +336,7 @@ _cdk_log_debug (const char *fmt, ...)
va_end (arg);
}
-
-#ifndef HAVE_PWD_H
-char *
-getpass (const char * prompt)
-{
- return NULL; /* fixme */
-}
-#endif
-
+#include <getpass.h>
char *
_cdk_passphrase_get( cdk_ctx_t hd, const char * prompt )