From c465212414603f28f60ecd67e64b00544e1338f3 Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Thu, 30 Jan 2020 19:48:23 +0100 Subject: [PATCH] obs-outputs: Remove hard-coded certificate paths on Linux The report in https://github.com/obsproject/obs-studio/issues/2350 identified the issue as being caused by mbedtls not following symbolic links, but it turns out the issue was the mbedtls_x509_crt_parse_path return value which was already fixed in 4d89123c. So these changes are no longer necessary. --- plugins/obs-outputs/librtmp/rtmp.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plugins/obs-outputs/librtmp/rtmp.c b/plugins/obs-outputs/librtmp/rtmp.c index 0fc922812..81ab5c862 100644 --- a/plugins/obs-outputs/librtmp/rtmp.c +++ b/plugins/obs-outputs/librtmp/rtmp.c @@ -348,12 +348,6 @@ RTMP_TLS_LoadCerts(RTMP *r) { "/etc/ssl/certs"); goto error; } - - // mbedtls_x509_crt_parse_path ignores symlinks which causes an issue on - // some distributions. try parsing the most common CA bundles directly - // to work around this (we don't care if it fails) - mbedtls_x509_crt_parse_file(chain, "/etc/ssl/certs/ca-bundle.crt"); - mbedtls_x509_crt_parse_file(chain, "/etc/ssl/certs/ca-certificates.crt"); #endif mbedtls_ssl_conf_ca_chain(&r->RTMP_TLS_ctx->conf, chain, NULL);