[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-217-gf8c6a0c

[Nikos Mavrogiannopoulos]

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=f8c6a0c9bf202c338088c36d3463958119b1f50e

The branch, master has been updated
       via  f8c6a0c9bf202c338088c36d3463958119b1f50e (commit)
      from  fa06298cbb15139f87d54c372109e03b0b8b17b8 (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 f8c6a0c9bf202c338088c36d3463958119b1f50e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Jun 9 20:35:20 2010 +0200

    Register the md5 handler if gcrypt is in fips mode once 
gnutls_global_init_extra() is called.

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

Summary of changes:
 libextra/gnutls_extra.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c
index 471114c..f8866cf 100644
--- a/libextra/gnutls_extra.c
+++ b/libextra/gnutls_extra.c
@@ -26,6 +26,11 @@
 #include <gnutls_extensions.h>
 #include <gnutls_algorithms.h>
 #include <ext_inner_application.h>
+
+#ifndef HAVE_LIBNETTLE
+# include <gcrypt.h>
+#endif
+
 #ifdef USE_LZO
 # ifdef USE_MINILZO
 #  include "minilzo/minilzo.h"
@@ -146,6 +151,22 @@ gnutls_global_init_extra (void)
     }
 #endif
 
+
+#ifndef HAVE_LIBNETTLE
+# 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 ();
+      if (ret)
+       fprintf (stderr, "gnutls_register_md5_handler: %s\n",
+                gnutls_strerror (ret));
+    }
+# endif
+#endif
+
   return 0;
 }
 


hooks/post-receive
-- 
GNU gnutls