virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/tls_openssl: use existing context handle

Browse Source
This commit is contained in:
Timo Rothenpieler
2025-07-01 22:21:11 +02:00
parent 2e72924ad1
commit 043d3fef8a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/tls_openssl.c
View File

@ -836,14 +836,14 @@ static av_cold int openssl_init_ca_key_cert(URLContext *h)
ret = AVERROR(EIO); ret = AVERROR(EIO);
goto fail; goto fail;
} }
} else if (p->tls_shared.cert_buf) { } else if (c->cert_buf) {
cert = cert_from_pem_string(p->tls_shared.cert_buf); cert = cert_from_pem_string(c->cert_buf);
if (SSL_CTX_use_certificate(p->ctx, cert) != 1) { 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)); av_log(p, AV_LOG_ERROR, "SSL: Init SSL_CTX_use_certificate failed, %s\n", openssl_get_error(p));
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
return ret; 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)); av_log(p, AV_LOG_ERROR, "TLS: Init cert failed, %s\n", openssl_get_error(p));
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
@ -857,14 +857,14 @@ static av_cold int openssl_init_ca_key_cert(URLContext *h)
ret = AVERROR(EIO); ret = AVERROR(EIO);
goto fail; goto fail;
} }
} else if (p->tls_shared.key_buf) { } else if (c->key_buf) {
p->pkey = pkey = pkey_from_pem_string(p->tls_shared.key_buf, 1); p->pkey = pkey = pkey_from_pem_string(c->key_buf, 1);
if (SSL_CTX_use_PrivateKey(p->ctx, pkey) != 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)); av_log(p, AV_LOG_ERROR, "TLS: Init SSL_CTX_use_PrivateKey failed, %s\n", openssl_get_error(p));
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
return ret; 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)); av_log(p, AV_LOG_ERROR, "TLS: Init pkey failed, %s\n", openssl_get_error(p));
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;