diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-05-07 09:48:00 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-05-07 09:48:37 +0200 |
| commit | 90907abb670c09fe7e4fa2e15b19517b74eea9dd (patch) | |
| tree | 9a9cf073a862902d27d01ce126ccd26823a0ce48 | |
| parent | 6f1cacf1e64dfd917b23be56e7ee3444dcd3c0c3 (diff) | |
| download | gnutls-90907abb670c09fe7e4fa2e15b19517b74eea9dd.tar.gz | |
No libgnutls-extra is required for certtool or p11tool.
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/certtool.c | 4 | ||||
| -rw-r--r-- | src/p11tool.c | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 509a446b0d..6df55fefab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -83,7 +83,7 @@ libcmd_cli_debug_la_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c #certtool certtool_SOURCES = certtool.c prime.c certtool-common.c -certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la +certtool_LDADD = ../lib/libgnutls.la certtool_LDADD += libcmd-certtool.la ../gl/libgnu.la certtool_LDADD += $(LTLIBGCRYPT) if HAVE_LIBCFG @@ -102,13 +102,13 @@ libcmd_certtool_la_CFLAGS = libcmd_certtool_la_SOURCES = certtool-gaa.c certtool.gaa certtool-gaa.h \ certtool-cfg.h certtool-cfg.c libcmd_certtool_la_LIBADD = ../gl/libgnu.la $(LTLIBREADLINE) -libcmd_certtool_la_LIBADD += ../lib/libgnutls.la ../libextra/libgnutls-extra.la +libcmd_certtool_la_LIBADD += ../lib/libgnutls.la libcmd_certtool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB) # p11 tool p11tool_gaa_CFLAGS = p11tool_SOURCES = p11tool.gaa p11tool.c pkcs11.c certtool-common.c p11tool.h -p11tool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la +p11tool_LDADD = ../lib/libgnutls.la p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la p11tool_LDADD += $(LTLIBGCRYPT) diff --git a/src/certtool.c b/src/certtool.c index 791c782c30..d01b13cef4 100644 --- a/src/certtool.c +++ b/src/certtool.c @@ -22,7 +22,6 @@ #include <config.h> #include <gnutls/gnutls.h> -#include <gnutls/extra.h> #include <gnutls/x509.h> #include <gnutls/openpgp.h> #include <gnutls/pkcs12.h> @@ -1079,9 +1078,6 @@ gaa_parser (int argc, char **argv) if ((ret = gnutls_global_init ()) < 0) error (EXIT_FAILURE, 0, "global_init: %s", gnutls_strerror (ret)); - if ((ret = gnutls_global_init_extra ()) < 0) - error (EXIT_FAILURE, 0, "global_init_extra: %s", gnutls_strerror (ret)); - memset (&cinfo, 0, sizeof (cinfo)); cinfo.privkey = info.privkey; cinfo.pubkey = info.pubkey; diff --git a/src/p11tool.c b/src/p11tool.c index 4c10f59ffc..7e97fb1d7d 100644 --- a/src/p11tool.c +++ b/src/p11tool.c @@ -23,7 +23,6 @@ #include <config.h> #include <gnutls/gnutls.h> -#include <gnutls/extra.h> #include <gnutls/x509.h> #include <gnutls/openpgp.h> #include <gnutls/pkcs12.h> |