* Allow multiple simultaneous IPC connections. All changes necessary for

[citadel.git] / citadel / client_crypto.h

diff --git a/citadel/client_crypto.h b/citadel/client_crypto.h
index 0ee5ced6a617380652a5ab23de6540a268ffcf9e..e757d9d2a43c1a462b51b93f9f376e81713b4ec2 100644 (file)
--- a/citadel/client_crypto.h
+++ b/citadel/client_crypto.h
@@ -1,21 +1,21 @@
 /* $Id$ */
 
+#ifdef HAVE_OPENSSL
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/rand.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Shared Diffie-Hellman parameters */
 #define DH_P           "1A74527AEE4EE2568E85D4FB2E65E18C9394B9C80C42507D7A6A0DBE9A9A54B05A9A96800C34C7AA5297095B69C88901EEFD127F969DCA26A54C0E0B5C5473EBAEB00957D2633ECAE3835775425DE66C0DE6D024DBB17445E06E6B0C78415E589B8814F08531D02FD43778451E7685541079CFFB79EF0D26EFEEBBB69D1E80383"
 #define DH_G           "2"
 #define DH_L           1024
 #define CIT_CIPHERS    "ALL:RC4+RSA:+SSLv2:@STRENGTH"  /* see ciphers(1) */
 
-int starttls(void);
-void endtls(void);
-void serv_read(char *buf, int bytes);
-void serv_write(char *buf, int nbytes);
-#ifdef HAVE_OPENSSL
-void serv_read_ssl(char *buf, int bytes);
-void serv_write_ssl(char *buf, int nbytes);
-void ssl_lock(int mode, int n, const char *file, int line);
-#endif /* HAVE_OPENSSL */
-
-extern int ssl_is_connected;
-
-void setCryptoStatusHook(void (*hook)(char *s));
+#ifdef __cplusplus
+}
+#endif