summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos <nmav@crystal.(none)>2008-02-19 23:19:15 +0200
committerNikos <nmav@crystal.(none)>2008-02-19 23:19:15 +0200
commit3867fd247d5960fbed4ecdf7ceab16c618800101 (patch)
tree6e953556a5ac4ed566f1388c9aef548cc205a3e5
parent6871e7be7d2a9ee6b7cd3e62119828b324117e95 (diff)
downloadgnutls-3867fd247d5960fbed4ecdf7ceab16c618800101.tar.gz
changes to compile with ENABLE_OPENPGP undef.
-rw-r--r--lib/auth_cert.h3
-rw-r--r--lib/openpgp/openpgp.h4
2 files changed, 2 insertions, 5 deletions
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 */