Include TLS/SSL API

diff --git a/Makefile.am b/Makefile.am
index 20049570a4e42abb845d9ef5b16b10c833fc71f1..cb737036043112984879496ee70a37ba08602520 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,7 @@ HEADERS_include = \
        include/vlc_filter.h \
        include/vlc_help.h \
        include/vlc_httpd.h \
+       include/vlc_tls.h \
        include/vlc_input.h \
        include/vlc_interface.h \
        include/vlc_keys.h \
@@ -360,6 +361,7 @@ SOURCES_libvlc_common = \
        src/stream_output/sap.c \
        src/misc/charset.c \
        src/misc/httpd.c \
+       src/misc/tls.c \
        src/misc/mtime.c \
        src/misc/block.c \
        src/misc/modules.c \

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 9499ff0cfa38d884f8c853d138c11743cce4a0d3..fc362e17bf5118af1d11cccd422664143a555a24 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -336,6 +336,8 @@ typedef struct data_buffer_t data_buffer_t;
 typedef struct stream_ctrl_t stream_ctrl_t;
 typedef struct pes_packet_t pes_packet_t;
 typedef struct network_socket_t network_socket_t;
+typedef struct tls_server_t tls_server_t;
+typedef struct tls_session_t tls_session_t;
 typedef struct iso639_lang_t iso639_lang_t;
 
 /* block */

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 9bcf01978a30e6a1230416bed25ad16ce1b3c851..89d75844434586dac027622bcf068774f2ebc6d7 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -99,6 +99,7 @@
 #include "stream_output.h"
 #include "osd.h"
 #include "vlc_httpd.h"
+#include "vlc_tls.h"
 
 #include "iso_lang.h"
 #include "charset.h"

diff --git a/src/misc/tls.c b/src/misc/tls.c
index 48f92387dbe9bad88ae4b60750ef149862a2c565..7abb14bb32d230b58a518a76695b50325b62c055 100644 (file)
--- a/src/misc/tls.c
+++ b/src/misc/tls.c
@@ -28,7 +28,6 @@
 #include "vlc_tls.h"
 
 
-#define HAVE_GNUTLS 1
 /*
  * TODO:
  * - libgcrypt thread-safety !!!