mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2024-09-29 04:25:55 -04:00
Update: completly abstracted OpenSSL into tls.[ch]
This commit is contained in:
parent
a1aa0196b2
commit
3376498e5e
@ -160,7 +160,7 @@ static unsigned long _next_connection_id(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_OPENSSL
|
#ifdef ICECAST_CAP_TLS
|
||||||
static void get_ssl_certificate(ice_config_t *config)
|
static void get_ssl_certificate(ice_config_t *config)
|
||||||
{
|
{
|
||||||
config->tls_ok = ssl_ok = 0;
|
config->tls_ok = ssl_ok = 0;
|
||||||
@ -213,7 +213,7 @@ static void get_ssl_certificate(ice_config_t *config)
|
|||||||
ICECAST_LOG_INFO("No TLS capability. "
|
ICECAST_LOG_INFO("No TLS capability. "
|
||||||
"Rebuild Icecast with openSSL support to enable this.");
|
"Rebuild Icecast with openSSL support to enable this.");
|
||||||
}
|
}
|
||||||
#endif /* HAVE_OPENSSL */
|
#endif /* ICECAST_CAP_TLS */
|
||||||
|
|
||||||
|
|
||||||
/* handlers (default) for reading and writing a connection_t, no encrpytion
|
/* handlers (default) for reading and writing a connection_t, no encrpytion
|
||||||
@ -263,7 +263,7 @@ connection_t *connection_create (sock_t sock, sock_t serversock, char *ip)
|
|||||||
*/
|
*/
|
||||||
void connection_uses_ssl(connection_t *con)
|
void connection_uses_ssl(connection_t *con)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_OPENSSL
|
#ifdef ICECAST_CAP_TLS
|
||||||
if (con->tls)
|
if (con->tls)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -16,6 +16,12 @@
|
|||||||
|
|
||||||
#include "common/net/sock.h"
|
#include "common/net/sock.h"
|
||||||
|
|
||||||
|
/* Do we have TLS Support? */
|
||||||
|
#if defined(HAVE_OPENSSL)
|
||||||
|
#define ICECAST_CAP_TLS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
typedef struct tls_ctx_tag tls_ctx_t;
|
typedef struct tls_ctx_tag tls_ctx_t;
|
||||||
typedef struct tls_tag tls_t;
|
typedef struct tls_tag tls_t;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user