X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_tls.h;h=8b55ee833d760b803f2dfd560158d2a1f2451c12;hb=14203444a5bc07c1069b25cd37f904ef831bbe48;hp=c2fb2e017594f94dff39ef9bbda0bea01ea830a8;hpb=179ffb95f427e265b6a6ef77d0b89fb33b67938f;p=vlc

diff --git a/include/vlc_tls.h b/include/vlc_tls.h
index c2fb2e0175..8b55ee833d 100644
--- a/include/vlc_tls.h
+++ b/include/vlc_tls.h
@@ -30,27 +30,26 @@
 # include <vlc_network.h>
 
 typedef struct vlc_tls vlc_tls_t;
-typedef struct vlc_tls_sys vlc_tls_sys_t;
 typedef struct vlc_tls_creds vlc_tls_creds_t;
-typedef struct vlc_tls_creds_sys vlc_tls_creds_sys_t;
-
 
+/** TLS session */
 struct vlc_tls
 {
     VLC_COMMON_MEMBERS
 
-    union {
-        module_t *module; /**< Plugin handle (client) */
-    } u;
-    vlc_tls_sys_t *sys;
+    void *sys;
 
     struct virtual_socket_t sock;
-    int  (*handshake) (struct vlc_tls *);
 };
 
-VLC_API vlc_tls_t *vlc_tls_ClientCreate (vlc_object_t *, int fd,
-                                         const char *hostname);
-VLC_API void vlc_tls_ClientDelete (vlc_tls_t *);
+VLC_API vlc_tls_t *vlc_tls_ClientSessionCreate (vlc_tls_creds_t *, int fd,
+                                         const char *host, const char *service,
+                                         const char *const *alpn, char **alp);
+vlc_tls_t *vlc_tls_SessionCreate (vlc_tls_creds_t *, int fd, const char *host,
+                                  const char *const *alpn);
+int vlc_tls_SessionHandshake (vlc_tls_t *, const char *host, const char *serv,
+                              char ** /*restrict*/ alp);
+VLC_API void vlc_tls_SessionDelete (vlc_tls_t *);
 
 /* NOTE: It is assumed that a->sock.p_sys = a */
 # define tls_Send( a, b, c ) (((vlc_tls_t *)a)->sock.pf_send (a, b, c))
@@ -58,29 +57,24 @@ VLC_API void vlc_tls_ClientDelete (vlc_tls_t *);
 # define tls_Recv( a, b, c ) (((vlc_tls_t *)a)->sock.pf_recv (a, b, c))
 
 
-/** TLS (server-side) credentials */
+/** TLS credentials (certificate, private and trust settings) */
 struct vlc_tls_creds
 {
     VLC_COMMON_MEMBERS
 
     module_t  *module;
-    vlc_tls_creds_sys_t *sys;
-
-    int (*add_CA) (vlc_tls_creds_t *, const char *path);
-    int (*add_CRL) (vlc_tls_creds_t *, const char *path);
+    void *sys;
 
-    int (*open) (vlc_tls_creds_t *, vlc_tls_t *, int fd);
-    void (*close) (vlc_tls_creds_t *, vlc_tls_t *);
+    int (*open) (vlc_tls_creds_t *, vlc_tls_t *, int fd, const char *host,
+                 const char *const *alpn);
+    int  (*handshake) (vlc_tls_t *, const char *host, const char *service,
+                       char ** /*restrict*/ alp);
+    void (*close) (vlc_tls_t *);
 };
 
+VLC_API vlc_tls_creds_t *vlc_tls_ClientCreate (vlc_object_t *);
 vlc_tls_creds_t *vlc_tls_ServerCreate (vlc_object_t *,
                                        const char *cert, const char *key);
-void vlc_tls_ServerDelete (vlc_tls_creds_t *);
-int vlc_tls_ServerAddCA (vlc_tls_creds_t *srv, const char *path);
-int vlc_tls_ServerAddCRL (vlc_tls_creds_t *srv, const char *path);
-
-vlc_tls_t *vlc_tls_ServerSessionCreate (vlc_tls_creds_t *, int fd);
-int vlc_tls_ServerSessionHandshake (vlc_tls_t *);
-void vlc_tls_ServerSessionDelete (vlc_tls_t *);
+VLC_API void vlc_tls_Delete (vlc_tls_creds_t *);
 
 #endif