[FFmpeg-cvslog] avformat/tls_openssl: use existing context handle
Timo Rothenpieler
git at videolan.org
Thu Jul 3 23:18:40 EEST 2025
ffmpeg | branch: master | Timo Rothenpieler <timo at rothenpieler.org> | Tue Jul 1 22:21:11 2025 +0200| [043d3fef8a7cb422e50abb32ea2d463cc2c4f187] | committer: Timo Rothenpieler
avformat/tls_openssl: use existing context handle
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=043d3fef8a7cb422e50abb32ea2d463cc2c4f187
---
libavformat/tls_openssl.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index 2a3905891d..51aabfb53b 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -836,14 +836,14 @@ static av_cold int openssl_init_ca_key_cert(URLContext *h)
ret = AVERROR(EIO);
goto fail;
}
- } else if (p->tls_shared.cert_buf) {
- cert = cert_from_pem_string(p->tls_shared.cert_buf);
+ } else if (c->cert_buf) {
+ cert = cert_from_pem_string(c->cert_buf);
if (SSL_CTX_use_certificate(p->ctx, cert) != 1) {
av_log(p, AV_LOG_ERROR, "SSL: Init SSL_CTX_use_certificate failed, %s\n", openssl_get_error(p));
ret = AVERROR(EINVAL);
return ret;
}
- } else if (p->tls_shared.is_dtls){
+ } else if (c->is_dtls){
av_log(p, AV_LOG_ERROR, "TLS: Init cert failed, %s\n", openssl_get_error(p));
ret = AVERROR(EINVAL);
goto fail;
@@ -857,14 +857,14 @@ static av_cold int openssl_init_ca_key_cert(URLContext *h)
ret = AVERROR(EIO);
goto fail;
}
- } else if (p->tls_shared.key_buf) {
- p->pkey = pkey = pkey_from_pem_string(p->tls_shared.key_buf, 1);
+ } else if (c->key_buf) {
+ p->pkey = pkey = pkey_from_pem_string(c->key_buf, 1);
if (SSL_CTX_use_PrivateKey(p->ctx, pkey) != 1) {
av_log(p, AV_LOG_ERROR, "TLS: Init SSL_CTX_use_PrivateKey failed, %s\n", openssl_get_error(p));
ret = AVERROR(EINVAL);
return ret;
}
- } else if (p->tls_shared.is_dtls){
+ } else if (c->is_dtls) {
av_log(p, AV_LOG_ERROR, "TLS: Init pkey failed, %s\n", openssl_get_error(p));
ret = AVERROR(EINVAL);
goto fail;
More information about the ffmpeg-cvslog
mailing list