[FFmpeg-cvslog] lavf/tls_mbedtls: add missing call to psa_crypto_init
sfan5
git at videolan.org
Tue Jun 11 18:12:05 EEST 2024
ffmpeg | branch: master | sfan5 <sfan5 at live.de> | Mon May 13 20:24:43 2024 +0200| [807d1505bfcd2bf3398833b005fa7f6948e24e9f] | committer: Anton Khirnov
lavf/tls_mbedtls: add missing call to psa_crypto_init
This is mandatory depending on configuration or at least with mbedTLS 3.6.0.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=807d1505bfcd2bf3398833b005fa7f6948e24e9f
---
libavformat/tls_mbedtls.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c
index 02f08fddbb..0d14e9f814 100644
--- a/libavformat/tls_mbedtls.c
+++ b/libavformat/tls_mbedtls.c
@@ -26,6 +26,9 @@
#include <mbedtls/platform.h>
#include <mbedtls/ssl.h>
#include <mbedtls/x509_crt.h>
+#ifdef MBEDTLS_PSA_CRYPTO_C
+#include <psa/crypto.h>
+#endif
#include "avformat.h"
#include "internal.h"
@@ -187,6 +190,13 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
if ((ret = ff_tls_open_underlying(shr, h, uri, options)) < 0)
goto fail;
+#ifdef MBEDTLS_PSA_CRYPTO_C
+ if ((ret = psa_crypto_init()) != PSA_SUCCESS) {
+ av_log(h, AV_LOG_ERROR, "psa_crypto_init returned %d\n", ret);
+ goto fail;
+ }
+#endif
+
mbedtls_ssl_init(&tls_ctx->ssl_context);
mbedtls_ssl_config_init(&tls_ctx->ssl_config);
mbedtls_entropy_init(&tls_ctx->entropy_context);
More information about the ffmpeg-cvslog
mailing list