[SCM] GNU gnutls branch, master, updated. gnutls_2_9_8-7-g31183cf

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=31183cf97cc8693f0d7064074061512ddbb97d86

The branch, master has been updated
       via  31183cf97cc8693f0d7064074061512ddbb97d86 (commit)
       via  f7dd137a47f4ae3c70ab821efee5b79364627e31 (commit)
      from  7c69ef158d8e2c7136c8363661a858baaf15155b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31183cf97cc8693f0d7064074061512ddbb97d86
Author: Simon Josefsson <address@hidden>
Date:   Fri Nov 6 08:32:04 2009 +0100

    Link to libgcrypt explicitly when libgcrypt functions are used.

commit f7dd137a47f4ae3c70ab821efee5b79364627e31
Author: Simon Josefsson <address@hidden>
Date:   Fri Nov 6 08:29:45 2009 +0100

    Fix libgcrypt usage.

-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am |   12 +++++++-----
 src/certtool.c  |    3 +++
 src/serv.c      |    3 +++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 77379db..80b4f76 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,8 @@ noinst_LTLIBRARIES =
 
 gnutls_serv_SOURCES = list.h serv.c common.h common.c certtool-common.h
 gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
-gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la $(LIBSOCKET) 
$(GETADDRINFO_LIB)
+gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la
+gnutls_serv_LDADD += $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB)
 noinst_LTLIBRARIES += libcmd-serv.la
 libcmd_serv_la_CFLAGS =
 libcmd_serv_la_SOURCES = serv.gaa serv-gaa.h serv-gaa.c
@@ -61,7 +62,8 @@ libcmd_psk_la_SOURCES = psk.gaa psk-gaa.h psk-gaa.c
 
 gnutls_cli_SOURCES = cli.c common.h common.c
 gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
-gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LIBSOCKET) 
$(GETADDRINFO_LIB)
+gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la
+gnutls_cli_LDADD += $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB)
 noinst_LTLIBRARIES += libcmd-cli.la
 libcmd_cli_la_CFLAGS =
 libcmd_cli_la_SOURCES = cli.gaa cli-gaa.h cli-gaa.c
@@ -74,9 +76,9 @@ libcmd_cli_debug_la_CFLAGS =
 libcmd_cli_debug_la_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c
 
 certtool_SOURCES = certtool.c prime.c
-certtool_LDADD = libcmd-certtool.la
-certtool_LDADD += ../lib/libgnutls.la ../libextra/libgnutls-extra.la
-certtool_LDADD += ../gl/libgnu.la
+certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
+certtool_LDADD += libcmd-certtool.la ../gl/libgnu.la
+certtool_LDADD += $(LTLIBGCRYPT)
 if HAVE_LIBCFG
 certtool_LDADD += -lcfg+
 else
diff --git a/src/certtool.c b/src/certtool.c
index d41be38..d8204be 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -919,6 +919,9 @@ gaa_parser (int argc, char **argv)
     }
 
 #ifdef gcry_fips_mode_active
+  /* Libgcrypt manual says that gcry_version_check must be called
+     before calling gcry_fips_mode_active. */
+  gcry_check_version (NULL);
   if (gcry_fips_mode_active ())
     {
       ret = gnutls_register_md5_handler ();
diff --git a/src/serv.c b/src/serv.c
index 7cee7c3..12c5ec7 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -849,6 +849,9 @@ main (int argc, char **argv)
   set_program_name (argv[0]);
 
 #ifdef gcry_fips_mode_active
+  /* Libgcrypt manual says that gcry_version_check must be called
+     before calling gcry_fips_mode_active. */
+  gcry_check_version (NULL);
   if (gcry_fips_mode_active ())
     {
       ret = gnutls_register_md5_handler ();


hooks/post-receive
-- 
GNU gnutls