changes to compile with ENABLE_OPENPGP undef.

diff --git a/lib/auth_cert.h b/lib/auth_cert.h
index 2ea528ebcf95ed2a834f87a8ddaa1b134372c98e..8e03af61a12ab80c32510529bedc043ebf4ce57e 100644 (file)
--- 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 e32db263330ab23387fe1bc88a266b7f378b14be..2030d38371150f19528320150012a4a59d989b9a 100644 (file)
--- 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 */