Commit 68fd535b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

HTTPS out: handle cert paths from the sout chain, not just config

Note that all outputs onto the same TCP port must have the same certificates.
(cherry picked from commit 123d3e48)
parent 0e4d1695
...@@ -217,10 +217,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -217,10 +217,10 @@ static int Open( vlc_object_t *p_this )
/* SSL support */ /* SSL support */
if( p_access->psz_access && !strcmp( p_access->psz_access, "https" ) ) if( p_access->psz_access && !strcmp( p_access->psz_access, "https" ) )
{ {
psz_cert = config_GetPsz( p_this, SOUT_CFG_PREFIX"cert" ); psz_cert = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"cert" );
psz_key = config_GetPsz( p_this, SOUT_CFG_PREFIX"key" ); psz_key = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"key" );
psz_ca = config_GetPsz( p_this, SOUT_CFG_PREFIX"ca" ); psz_ca = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"ca" );
psz_crl = config_GetPsz( p_this, SOUT_CFG_PREFIX"crl" ); psz_crl = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"crl" );
if( i_bind_port <= 0 ) if( i_bind_port <= 0 )
i_bind_port = DEFAULT_SSL_PORT; i_bind_port = DEFAULT_SSL_PORT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment