From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Thu, 12 Jan 2012 08:21:13 +0000 (+0000)
Subject: SSL/PKI specific calls moved to canl_ssl.h
X-Git-Tag: emi-canl-c_R_1_0_0_0~80
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8ce6e9f2f4c4c0a50fbf521baf6a51ecb0b43168;p=jra1mw.git

SSL/PKI specific calls moved to canl_ssl.h
---

diff --git a/emi.canl.canl-c/src/canl.h b/emi.canl.canl-c/src/canl.h
index 8ef6d2a..442f38c 100644
--- a/emi.canl.canl-c/src/canl.h
+++ b/emi.canl.canl-c/src/canl.h
@@ -13,10 +13,6 @@ typedef void *canl_io_handler;
 typedef void *canl_ctx;
 typedef void *cred_handler;
 
-typedef void *canl_x509;
-typedef void *canl_stack_of_x509;
-typedef void *canl_pkey;
-
 typedef char (*canl_password_callback)(canl_ctx cc, void *userdata);
 
 canl_ctx canl_create_ctx();
@@ -41,11 +37,6 @@ int canl_get_error(canl_ctx cc, char ** reason);
 int canl_io_close(canl_ctx cc, canl_io_handler io);
 int canl_io_destroy(canl_ctx cc, canl_io_handler io);
 
-int canl_set_ctx_own_cert(canl_ctx cc, canl_x509 cert,
-        canl_stack_of_x509 chain, canl_pkey key);
-int canl_set_ctx_own_cert_file(canl_ctx cc, char *cert, char *key,
-        canl_password_callback cb, void *userdata);
-
 #ifdef __cplusplus
 }       
 #endif 
diff --git a/emi.canl.canl-c/src/canl_ssl.h b/emi.canl.canl-c/src/canl_ssl.h
new file mode 100644
index 0000000..5d419c7
--- /dev/null
+++ b/emi.canl.canl-c/src/canl_ssl.h
@@ -0,0 +1,21 @@
+#ifndef _CANL_SSL_H
+#define _CANL_SSL_H
+
+#include <canl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef char (*canl_password_callback)(canl_ctx cc, void *userdata);
+
+int canl_set_ctx_own_cert(canl_ctx cc, canl_x509 cert,
+        canl_stack_of_x509 chain, canl_pkey key);
+int canl_set_ctx_own_cert_file(canl_ctx cc, char *cert, char *key,
+        canl_password_callback cb, void *userdata);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif