X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf-ssl.h;h=a8896a1f634db1fd511a9129442e2d50b3b05420;hp=3fab579ca7c41983756d38dc3f968e1e2abfc2fe;hb=HEAD;hpb=03628dbeaf40a9de34b3eb6d5bf6dd34eed8248c

diff --git a/src/ngircd/conf-ssl.h b/src/ngircd/conf-ssl.h
index 3fab579c..a8896a1f 100644
--- a/src/ngircd/conf-ssl.h
+++ b/src/ngircd/conf-ssl.h
@@ -13,6 +13,10 @@
 #ifdef HAVE_LIBSSL
 #define SSL_SUPPORT
 #include <openssl/ssl.h>
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define OpenSSL_version SSLeay_version
+#define OPENSSL_VERSION SSLEAY_VERSION
+#endif
 #endif
 #ifdef HAVE_LIBGNUTLS
 #define SSL_SUPPORT
@@ -33,19 +37,17 @@ struct ConnSSL_State {
 	SSL *ssl;
 #endif
 #ifdef HAVE_LIBGNUTLS
-	gnutls_session gnutls_session;
+	gnutls_session_t gnutls_session;
 	void *cookie;		/* pointer to server configuration structure
 				   (for outgoing connections), or NULL. */
+	size_t x509_cred_idx;	/* index of active x509 credential record */
 #endif
+	char *fingerprint;
 };
 
-bool
-ConnSSL_InitLibrary(void);
-#else
-static inline bool
-ConnSSL_InitLibrary(void)
-{ return true; }
-#endif /* SSL_SUPPORT */
+#endif
+
+GLOBAL bool ConnSSL_InitLibrary PARAMS((void));
 
 #endif /* conf_ssl_h */