[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-35-gbfedb37

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

The branch, master has been updated
       via  bfedb373f4b53da3380d29177b3a20e8d133589a (commit)
      from  0c77766e327800af38f621c747bc9a941114aac7 (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 bfedb373f4b53da3380d29177b3a20e8d133589a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Apr 17 21:39:57 2012 +0200

    Use openpgp if enabled.

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

Summary of changes:
 lib/verify-tofu.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c
index b2a34af..5b2ce17 100644
--- a/lib/verify-tofu.c
+++ b/lib/verify-tofu.c
@@ -440,6 +440,7 @@ cleanup:
 
 static int pgp_crt_to_raw_pubkey(const gnutls_datum_t * cert, gnutls_datum_t 
*rpubkey)
 {
+#ifdef ENABLE_OPENPGP
 gnutls_openpgp_crt_t crt = NULL;
 gnutls_pubkey_t pubkey = NULL;
 size_t size;
@@ -503,6 +504,9 @@ cleanup:
   gnutls_pubkey_deinit(pubkey);
 
   return ret;
+#else
+  return GNUTLS_E_UNIMPLEMENTED_FEATURE;
+#endif
 }
 
 static 


hooks/post-receive
-- 
GNU gnutls