From 2699bbbd77a76b83007c5c44e7c1416abd1df866 Mon Sep 17 00:00:00 2001 From: Florian Zwoch Date: Mon, 6 Jan 2020 21:30:03 +0100 Subject: [PATCH] obs-outputs: Fix mbedtls use of deprecated functions mbedtls_md5_starts(), mbedtls_md5_update() and mbedtls_md5_finish() have been marked deprecated since mbedtls version 2.7 and may go away in the future. These function have been superseded by versions with a return value. They are suffixed with "_ret". We do not actually check return values. Also the header "mbedtls/net.h" has been superseded by "mbedtls/net_sockets.h". --- plugins/obs-outputs/librtmp/rtmp.c | 6 +++--- plugins/obs-outputs/librtmp/rtmp_sys.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/obs-outputs/librtmp/rtmp.c b/plugins/obs-outputs/librtmp/rtmp.c index 289ab5176..580a668f2 100644 --- a/plugins/obs-outputs/librtmp/rtmp.c +++ b/plugins/obs-outputs/librtmp/rtmp.c @@ -2696,9 +2696,9 @@ b64enc(const unsigned char *input, int length, char *output, int maxsize) #if defined(USE_MBEDTLS) typedef mbedtls_md5_context MD5_CTX; -#define MD5_Init(ctx) mbedtls_md5_init(ctx); mbedtls_md5_starts(ctx) -#define MD5_Update(ctx,data,len) mbedtls_md5_update(ctx,(unsigned char *)data,len) -#define MD5_Final(dig,ctx) mbedtls_md5_finish(ctx,dig); mbedtls_md5_free(ctx) +#define MD5_Init(ctx) mbedtls_md5_init(ctx); mbedtls_md5_starts_ret(ctx) +#define MD5_Update(ctx,data,len) mbedtls_md5_update_ret(ctx,(unsigned char *)data,len) +#define MD5_Final(dig,ctx) mbedtls_md5_finish_ret(ctx,dig); mbedtls_md5_free(ctx) #elif defined(USE_POLARSSL) #define MD5_CTX md5_context diff --git a/plugins/obs-outputs/librtmp/rtmp_sys.h b/plugins/obs-outputs/librtmp/rtmp_sys.h index 1e8e4dc86..fd579d648 100644 --- a/plugins/obs-outputs/librtmp/rtmp_sys.h +++ b/plugins/obs-outputs/librtmp/rtmp_sys.h @@ -82,7 +82,7 @@ #if defined(USE_MBEDTLS) #include -#include +#include #include #include #include