File rtmpdump-update_for_nettle4.patch of Package rtmpdump

File rtmpdump-update_for_nettle4.patch of Package rtmpdump (Revision 16)

Currently displaying revision 16 , Show latest

diff -rup librtmp/handshake.h.orig librtmp/handshake.h
--- librtmp/handshake.h.orig	2026-10-10 13:07:16.825552484 +0200
+++ librtmp/handshake.h	2026-10-10 14:32:40.581934591 +0200
@@ -43,6 +43,7 @@ typedef arc4_context *	RC4_handle;
 #define RC4_free(h)	free(h)
 
 #elif defined(USE_GNUTLS)
+#include <nettle/version.h>
 #include <nettle/hmac.h>
 #include <nettle/arcfour.h>
 #ifndef SHA256_DIGEST_LENGTH
@@ -52,7 +53,11 @@ typedef arc4_context *	RC4_handle;
 #define HMAC_CTX	struct hmac_sha256_ctx
 #define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(&ctx, len, key)
 #define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
+#if NETTLE_VERSION_MAJOR >= 4
+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, dig)
+#else
 #define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
+#endif
 #define HMAC_close(ctx)
 
 typedef struct arcfour_ctx*	RC4_handle;
diff -rup librtmp/hashswf.c.orig librtmp/hashswf.c
--- librtmp/hashswf.c.orig	2026-10-10 13:07:16.825552484 +0200
+++ librtmp/hashswf.c	2026-10-10 15:03:02.216666864 +0200
@@ -43,6 +43,7 @@
 #define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
 #define HMAC_close(ctx)
 #elif defined(USE_GNUTLS)
+#include <nettle/version.h>
 #include <nettle/hmac.h>
 #ifndef SHA256_DIGEST_LENGTH
 #define SHA256_DIGEST_LENGTH	32
@@ -51,7 +52,11 @@
 #define HMAC_CTX	struct hmac_sha256_ctx
 #define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(&ctx, len, key)
 #define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
+#if NETTLE_VERSION_MAJOR >= 4
+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, dig)
+#else
 #define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
+#endif
 #define HMAC_close(ctx)
 #else	/* USE_OPENSSL */
 #include <openssl/ssl.h>
diff -rup librtmp/rtmp.c.orig librtmp/rtmp.c
--- librtmp/rtmp.c.orig	2026-10-10 13:07:16.825552484 +0200
+++ librtmp/rtmp.c	2026-10-10 14:58:58.904733221 +0200
@@ -55,6 +55,7 @@ static const char *my_dhm_G = "4";
 #elif defined(USE_GNUTLS)
 #include <gnutls/gnutls.h>
 #define MD5_DIGEST_LENGTH 16
+#include <nettle/version.h>
 #include <nettle/base64.h>
 #include <nettle/md5.h>
 #else	/* USE_OPENSSL */
@@ -2492,7 +2493,11 @@ b64enc(const unsigned char *input, int l
 typedef struct md5_ctx	MD5_CTX;
 #define MD5_Init(ctx)	md5_init(ctx)
 #define MD5_Update(ctx,data,len)	md5_update(ctx,len,data)
+#if NETTLE_VERSION_MAJOR >= 4
+#define MD5_Final(dig,ctx)	md5_digest(ctx,dig)
+#else
 #define MD5_Final(dig,ctx)	md5_digest(ctx,MD5_DIGEST_LENGTH,dig)
+#endif
 #else
 #endif