From: Nikos <nmav@crystal.(none)>
Date: Tue, 19 Feb 2008 21:19:15 +0000 (+0200)
Subject: changes to compile with ENABLE_OPENPGP undef.
X-Git-Tag: gnutls_2_3_1~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3867fd247d5960fbed4ecdf7ceab16c618800101;p=thirdparty%2Fgnutls.git

changes to compile with ENABLE_OPENPGP undef.
---

diff --git a/lib/auth_cert.h b/lib/auth_cert.h
index 2ea528ebcf..8e03af61a1 100644
--- a/lib/auth_cert.h
+++ b/lib/auth_cert.h
@@ -62,9 +62,10 @@ typedef struct gnutls_certificate_credentials_st
    * cert_list[i][0].
    */
 
+#ifdef ENABLE_OPENPGP
   /* OpenPGP specific stuff */
-
   gnutls_openpgp_keyring_t keyring;
+#endif
 
   /* X509 specific stuff */
 
diff --git a/lib/openpgp/openpgp.h b/lib/openpgp/openpgp.h
index e32db26333..2030d38371 100644
--- a/lib/openpgp/openpgp.h
+++ b/lib/openpgp/openpgp.h
@@ -68,10 +68,6 @@ int _gnutls_openpgp_find_subkey_idx( cdk_kbnode_t knode, uint32_t keyid[2],
 
 int _gnutls_openpgp_get_algo( int cdk_algo);
 
-#else /* no opencdk */
-
-typedef void *gnutls_openpgp_keyring_t;
-
 #endif /* ENABLE_OPENPGP */
 
 #endif /* OPENPGP_LOCAL_H */