Fix libextra build. Make gnutls-cli work in libgcrypt FIPS mode.

diff --git a/configure.in b/configure.in
index ea9bd28c6ee4dc541849a312f786ba0f37bb5f58..da8a582040275fbcd3a65777d0b0a90d48b94cd9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -702,7 +702,8 @@ AC_CONFIG_FILES([Makefile po/Makefile.in \
        tests/hostname-check/Makefile \
        includes/Makefile includes/gnutls/gnutls.h \
        lib/Makefile lib/minitasn1/Makefile lib/x509/Makefile \
-       libextra/Makefile lib/openpgp/Makefile lib/opencdk/Makefile \
+       libextra/Makefile libextra/gl/Makefile \
+       lib/openpgp/Makefile lib/opencdk/Makefile \
        tests/openpgp/Makefile tests/openpgp-certs/Makefile \
        src/Makefile \
        src/cfg/Makefile src/cfg/platon/Makefile src/cfg/platon/str/Makefile \

diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index dac1d418ee61269d4e0626a15fa9133e0d4e821f..f4dba567489aa99adab1951a90830ced7facaac2 100644 (file)
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -31,7 +31,7 @@ else
 AM_CPPFLAGS += $(LIBTASN1_CFLAGS)
 endif
 
-SUBDIRS = 
+SUBDIRS = gl
 
 bin_SCRIPTS = libgnutls-extra-config
 
@@ -105,7 +105,8 @@ libgnutls_extra_la_LDFLAGS += \
 
 libgnutls_extra_la_SOURCES += libgnutls-extra.vers
 
-libgnutls_extra_la_LIBADD += ../lgl/liblgnu.la ../lib/libgnutls.la
+libgnutls_extra_la_LIBADD += ../lgl/liblgnu.la gl/libxgnu.la \
+       ../lib/libgnutls.la
 
 if HAVE_LD_VERSION_SCRIPT
 libgnutls_extra_la_LDFLAGS += \

diff --git a/src/Makefile.am b/src/Makefile.am
index 157f413658621d98a54da30b3998ddd7fce6ff91..25783ea53d9c6e8710810543691511467cdd6c9f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,7 @@ psktool_LDADD = ../lib/libgnutls.la \
 
 gnutls_cli_SOURCES = cli.gaa cli-gaa.h cli-gaa.c cli.c common.h        \
        common.c select.c
-gnutls_cli_LDADD = ../lib/libgnutls.la \
+gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
        $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
 
 gnutls_cli_debug_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c  \

diff --git a/src/cli.c b/src/cli.c
index 5f81bd1417540fd7c190bf6f076a879fbd8b95a6..b23665225f6f38e136889433f69ac54ebd2ceccf 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -584,6 +584,16 @@ main (int argc, char **argv)
 
   gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
 
+#ifdef gcry_fips_mode_active
+  if (gcry_fips_mode_active())
+    {
+      ret = gnutls_register_md5_handler ();
+      if (ret)
+       fprintf (stderr, "gnutls_register_md5_handler: %s\n",
+                gnutls_strerror (ret));
+    }
+#endif
+
   if ((ret = gnutls_global_init ()) < 0)
     {
       fprintf (stderr, "global_init: %s\n", gnutls_strerror (ret));