Browse Source

Merge pull request #2304 from fzwoch/fix_embedtls_deprecated

obs-outputs: Fix mbedtls use of deprecated functions
Jim 5 years ago
parent
commit
861ebff4c9
2 changed files with 4 additions and 4 deletions
  1. 3 3
      plugins/obs-outputs/librtmp/rtmp.c
  2. 1 1
      plugins/obs-outputs/librtmp/rtmp_sys.h

+ 3 - 3
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

+ 1 - 1
plugins/obs-outputs/librtmp/rtmp_sys.h

@@ -82,7 +82,7 @@
 
 #if defined(USE_MBEDTLS)
 #include <mbedtls/version.h>
-#include <mbedtls/net.h>
+#include <mbedtls/net_sockets.h>
 #include <mbedtls/ssl.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>