diff mbox series

[FFmpeg-devel,v2,2/6] lavf/tls_mbedtls: add missing call to psa_crypto_init

Message ID DU0PR03MB95678CA87B4B010C3736FBB6ECF22@DU0PR03MB9567.eurprd03.prod.outlook.com
State New
Headers show
Series [FFmpeg-devel,v2,1/6] lavf/tls_mbedtls: handle more error codes for | expand

Checks

Context Check Description
andriy/configure_x86 warning Failed to apply patch
yinshiyou/configure_loongarch64 warning Failed to apply patch

Commit Message

sfan5 May 29, 2024, 11:01 a.m. UTC
diff mbox series

Patch

From 18142d98aed9e48a78a37590341bf48f1fe2339e Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Mon, 13 May 2024 20:24:43 +0200
Subject: [PATCH v2 2/6] 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: sfan5 <sfan5@live.de>
---
 libavformat/tls_mbedtls.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c
index 1226e3780b..1a61fc57d6 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"
@@ -184,6 +187,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);
-- 
2.45.1