[SCM] GNU gnutls branch, master, updated. gnutls_2_9_3-65-ge14c1af

[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=e14c1af00737dc710147a559a2989b8c66c0c079

The branch, master has been updated
       via  e14c1af00737dc710147a559a2989b8c66c0c079 (commit)
      from  c07d644cc8db20126499a6ee7a03238d6e9e64d7 (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 e14c1af00737dc710147a559a2989b8c66c0c079
Author: Simon Josefsson <address@hidden>
Date:   Thu Sep 3 11:37:23 2009 +0200

    Build when OpenPGP is disabled.

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

Summary of changes:
 tests/hostname-check.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/hostname-check.c b/tests/hostname-check.c
index eafefe1..45257eb 100644
--- a/tests/hostname-check.c
+++ b/tests/hostname-check.c
@@ -27,7 +27,9 @@
 #include <string.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#include <gnutls/openpgp.h>
+#ifdef ENABLE_OPENPGP
+# include <gnutls/openpgp.h>
+#endif
 
 #include "utils.h"
 
@@ -635,6 +637,7 @@ char pem10[] =
   "/yfcgJk0Zr3jMVTVtj/O1AijUihhXr0=\n"
   "-----END CERTIFICATE-----\n";
 
+#ifdef ENABLE_OPENPGP
 /* Check basic OpenPGP comparison too.
    <http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3812>. */
 char pem11[] =
@@ -667,12 +670,15 @@ char pem11[] =
   "Z/V2Me1st/9pqPfZAJ4+9YBnyjCq/0vosIoZabi+s92m7g==\n"
   "=NkXV\n"
   "-----END PGP PUBLIC KEY BLOCK-----\n";
+#endif
 
 void
 doit (void)
 {
   gnutls_x509_crt_t x509;
+#ifdef ENABLE_OPENPGP
   gnutls_openpgp_crt_t pgp;
+#endif
   gnutls_datum_t data;
   int ret;
 
@@ -684,9 +690,11 @@ doit (void)
   if (ret < 0)
     fail ("gnutls_x509_crt_init: %d\n", ret);
 
+#ifdef ENABLE_OPENPGP
   ret = gnutls_openpgp_crt_init (&pgp);
   if (ret < 0)
     fail ("gnutls_openpgp_crt_init: %d\n", ret);
+#endif
 
   success ("Testing pem1...\n");
   data.data = pem1;
@@ -930,6 +938,7 @@ doit (void)
   else
     success ("Hostname correctly does not match (%d)\n", ret);
 
+#ifdef ENABLE_OPENPGP
   success ("Testing pem11...\n");
   data.data = pem11;
   data.size = strlen (pem11);
@@ -944,8 +953,9 @@ doit (void)
   else
     fail ("Hostname incorrectly does not match (%d)\n", ret);
 
-  gnutls_x509_crt_deinit (x509);
   gnutls_openpgp_crt_deinit (pgp);
+#endif
+  gnutls_x509_crt_deinit (x509);
 
   gnutls_global_deinit ();
 }


hooks/post-receive
-- 
GNU gnutls