Attachment #248943 for bug #277418




PORTNAME=	librtmp
PORTVERSION=	2.6
PORTREVISION=	1
CATEGORIES=	multimedia net
MASTER_SITES=	${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=	je3kmz
DISTNAME=	rtmpdump-${PORTVERSION}

MAINTAINER=	hrs@FreeBSD.org

LICENSE=	LGPL21+
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		pkgconfig ssl tar:xz
USE_LDCONFIG=	yes

CFLAGS+=	-I${OPENSSLINC}
LDFLAGS+=	-L${OPENSSLLIB}
WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
WRKSRC=		${WRKDIR}/rtmpdump-c5f04a5/${PORTNAME}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1584312692	1	TIMESTAMP = 1709607346
2	SHA256 (rtmpdump-2.4.20190330.tar.gz) = fd8c21263d93fbde8bee8aa6c5f6a657789674bb0f9e74f050651504d5f43b46	2	SHA256 (rtmpdump-2.6.tar.xz) = 764f14ebf0ee1abd07dcc841e0a37770f51d79b6785f1bb3b69db2a982c3efff
3	SIZE (rtmpdump-2.4.20190330.tar.gz) = 143037	3	SIZE (rtmpdump-2.6.tar.xz) = 104120




--- Makefile.orig	2021-02-19 17:54:54 UTC
+++ Makefile
@@ -1,19 +1,21 @@
 VERSION=v2.4
 
-prefix=/usr/local
+prefix=$(PREFIX)
 
 incdir=$(prefix)/include/librtmp
 bindir=$(prefix)/bin
 libdir=$(prefix)/lib
-mandir=$(prefix)/man
+libdatadir=$(prefix)/libdata
+mandir=$(prefix)/share/man
 BINDIR=$(DESTDIR)$(bindir)
 INCDIR=$(DESTDIR)$(incdir)
 LIBDIR=$(DESTDIR)$(libdir)
+LIBDATADIR=$(DESTDIR)$(libdatadir)
 MANDIR=$(DESTDIR)$(mandir)
 
-CC=$(CROSS_COMPILE)gcc
-LD=$(CROSS_COMPILE)ld
-AR=$(CROSS_COMPILE)ar
+CC?=$(CROSS_COMPILE)gcc
+LD?=$(CROSS_COMPILE)ld
+AR?=$(CROSS_COMPILE)ar
 
 SYS=posix
 CRYPTO=OPENSSL
@@ -23,14 +25,14 @@ DEF_OPENSSL=-DUSE_OPENSSL
 DEF_GNUTLS=-DUSE_GNUTLS
 DEF_=-DNO_CRYPTO
 REQ_GNUTLS=gnutls,hogweed,nettle
-REQ_OPENSSL=libssl,libcrypto
+#REQ_OPENSSL=libssl,libcrypto
 PUB_GNUTLS=-lgmp
 LIBZ=-lz
 LIBS_posix=
 LIBS_darwin=
 LIBS_mingw=-lws2_32 -lwinmm -lgdi32
 LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
-LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
+LIB_OPENSSL=-L$(OPENSSLLIB) -lssl -lcrypto $(LIBZ)
 LIB_POLARSSL=-lpolarssl $(LIBZ)
 PRIVATE_LIBS=$(LIBS_$(SYS))
 CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS)
@@ -74,8 +76,9 @@ SO_INST=$(SOINST_$(SHARED))
 
 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
 OPT=-O2
-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
-LDFLAGS=$(XLDFLAGS)
+#CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
+CFLAGS+=$(OPT) $(SO_DEF)
+#LDFLAGS=$(XLDFLAGS)
 
 
 OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
@@ -102,21 +105,23 @@ librtmp.pc: librtmp.pc.in Makefile
 	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
 		-e "s;@VERSION@;$(VERSION);" \
 		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
+		-e "s;@OPENSSLLIB@;$(OPENSSLLIB);" \
+		-e "s;@OPENSSLINC@;$(OPENSSLINC);" \
 		-e "s;@PUBLIC_LIBS@;$(PUBLIC_LIBS);" \
 		-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
 
 install:	install_base $(SO_INST)
 
 install_base:	librtmp.a librtmp.pc
-	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3
-	cp amf.h http.h log.h rtmp.h $(INCDIR)
-	cp librtmp.a $(LIBDIR)
-	cp librtmp.pc $(LIBDIR)/pkgconfig
-	cp librtmp.3 $(MANDIR)/man3
+	-mkdir -p $(INCDIR) $(LIBDATADIR)/pkgconfig $(MANDIR)/man3
+	${BSD_INSTALL_DATA} amf.h http.h log.h rtmp.h $(INCDIR)
+	${BSD_INSTALL_DATA} librtmp.a $(LIBDIR)
+	${BSD_INSTALL_DATA} librtmp.pc $(LIBDATADIR)/pkgconfig
+	${BSD_INSTALL_DATA} librtmp.3 $(MANDIR)/man3
 
 install_so:	librtmp$(SO_EXT)
 	-mkdir -p $(SODIR)
-	cp librtmp$(SO_EXT) $(SODIR)
+	${BSD_INSTALL_LIB} librtmp$(SO_EXT) $(SODIR)
 	$(INSTALL_IMPLIB)
 	cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX)
 




--- librtmp/Makefile.orig	2019-03-30 21:33:00 UTC
+++ librtmp/Makefile
@@ -1,19 +1,21 @@ VERSION=v2.4
 VERSION=v2.4
 
-prefix=/usr/local
+prefix=$(PREFIX)
 
 incdir=$(prefix)/include/librtmp
 bindir=$(prefix)/bin
 libdir=$(prefix)/lib
-mandir=$(prefix)/man
+libdatadir=$(prefix)/libdata
+mandir=$(prefix)/share/man
 BINDIR=$(DESTDIR)$(bindir)
 INCDIR=$(DESTDIR)$(incdir)
 LIBDIR=$(DESTDIR)$(libdir)
+LIBDATADIR=$(DESTDIR)$(libdatadir)
 MANDIR=$(DESTDIR)$(mandir)
 
-CC=$(CROSS_COMPILE)gcc
-LD=$(CROSS_COMPILE)ld
-AR=$(CROSS_COMPILE)ar
+CC?=$(CROSS_COMPILE)gcc
+LD?=$(CROSS_COMPILE)ld
+AR?=$(CROSS_COMPILE)ar
 
 SYS=posix
 CRYPTO=OPENSSL
@@ -23,14 +25,14 @@ REQ_GNUTLS=gnutls,hogweed,nettle
 DEF_GNUTLS=-DUSE_GNUTLS
 DEF_=-DNO_CRYPTO
 REQ_GNUTLS=gnutls,hogweed,nettle
-REQ_OPENSSL=libssl,libcrypto
+#REQ_OPENSSL=libssl,libcrypto
 PUB_GNUTLS=-lgmp
 LIBZ=-lz
 LIBS_posix=
 LIBS_darwin=
 LIBS_mingw=-lws2_32 -lwinmm -lgdi32
 LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
-LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
+LIB_OPENSSL=-L$(OPENSSLLIB) -lssl -lcrypto $(LIBZ)
 LIB_POLARSSL=-lpolarssl $(LIBZ)
 PRIVATE_LIBS=$(LIBS_$(SYS))
 CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS)
@@ -74,8 +76,9 @@ OPT=-O2
 
 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
 OPT=-O2
-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
-LDFLAGS=$(XLDFLAGS)
+#CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
+CFLAGS+=$(DEF) $(SO_DEF)
+#LDFLAGS=$(XLDFLAGS)
 
 
 OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
@@ -102,20 +105,22 @@ librtmp.pc: librtmp.pc.in Makefile
 	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
 		-e "s;@VERSION@;$(VERSION);" \
 		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
+		-e "s;@OPENSSLLIB@;$(OPENSSLLIB);" \
+		-e "s;@OPENSSLINC@;$(OPENSSLINC);" \
 		-e "s;@PUBLIC_LIBS@;$(PUBLIC_LIBS);" \
 		-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
 
 install:	install_base $(SO_INST)
 
 install_base:	librtmp.a librtmp.pc
-	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
+	-mkdir -p $(INCDIR) $(LIBDATADIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
 	cp amf.h http.h log.h rtmp.h $(INCDIR)
 	cp librtmp.a $(LIBDIR)
-	cp librtmp.pc $(LIBDIR)/pkgconfig
+	cp librtmp.pc $(LIBDATADIR)/pkgconfig
 	cp librtmp.3 $(MANDIR)/man3
 
 install_so:	librtmp$(SO_EXT)
-	cp librtmp$(SO_EXT) $(SODIR)
+	${BSD_INSTALL_LIB} librtmp$(SO_EXT) $(SODIR)
 	$(INSTALL_IMPLIB)
 	cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX)
 




--- librtmp/dh.h.orig	2016-02-29 01:15:13 UTC
+++ librtmp/dh.h
@@ -194,7 +194,7 @@ typedef BIGNUM * MP_t;
 
 /* RFC 2631, Section 2.1.5, http://www.ietf.org/rfc/rfc2631.txt */
 static int
-isValidPublicKey(MP_t y, MP_t p, MP_t q)
+isValidPublicKey(const MP_t y, const MP_t p, const MP_t q)
 {
   int ret = TRUE;
   MP_t bn;
@@ -253,20 +253,43 @@ DHInit(int nKeyBits)
   if (!dh)
     goto failed;
 
+#if !defined(USE_OPENSSL) || defined(LIBRESSL_VERSION_NUMBER) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
   MP_new(dh->g);
 
   if (!dh->g)
     goto failed;
+#else
+  BIGNUM *g;
 
+  MP_new(g);
+  if (g == NULL)
+    goto failed;
+#endif
+
+#if !defined(USE_OPENSSL) || defined(LIBRESSL_VERSION_NUMBER) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
   MP_gethex(dh->p, P1024, res);	/* prime P1024, see dhgroups.h */
+#else
+  const BIGNUM *p = DH_get0_p(dh);
+
+  MP_gethex(p, P1024, res);	/* prime P1024, see dhgroups.h */
+#endif
   if (!res)
     {
       goto failed;
     }
 
+#if !defined(USE_OPENSSL) || defined(LIBRESSL_VERSION_NUMBER) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
   MP_set_w(dh->g, 2);	/* base 2 */
+#else
+  MP_set_w(g, 2);	/* base 2 */
+  DH_set0_pqg(dh, p, NULL, g);
+#endif
 
+#if !defined(USE_OPENSSL) || defined(LIBRESSL_VERSION_NUMBER) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
   dh->length = nKeyBits;
+#else
+  DH_set_length(dh, nKeyBits);
+#endif
   return dh;
 
 failed:
@@ -293,12 +316,20 @@ DHGenerateKey(MDH *dh)
       MP_gethex(q1, Q1024, res);
       assert(res);
 
+#if !defined(USE_OPENSSL) || defined(LIBRESSL_VERSION_NUMBER) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
       res = isValidPublicKey(dh->pub_key, dh->p, q1);
+#else
+      res = isValidPublicKey(DH_get0_pub_key(dh), DH_get0_p(dh), q1);
+#endif
       if (!res)
 	{
+#if !defined(USE_OPENSSL) || defined(LIBRESSL_VERSION_NUMBER) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
 	  MP_free(dh->pub_key);
 	  MP_free(dh->priv_key);
 	  dh->pub_key = dh->priv_key = 0;
+#else
+          DH_set0_key(dh, NULL, NULL);
+#endif
 	}
 
       MP_free(q1);
@@ -314,15 +345,27 @@ static int
 DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
 {
   int len;
+#if !defined(USE_OPENSSL) || defined(LIBRESSL_VERSION_NUMBER) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
   if (!dh || !dh->pub_key)
+#else
+  if (!dh || !DH_get0_pub_key(dh))
+#endif
     return 0;
 
+#if !defined(USE_OPENSSL) || defined(LIBRESSL_VERSION_NUMBER) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
   len = MP_bytes(dh->pub_key);
+#else
+  len = MP_bytes(DH_get0_pub_key(dh));
+#endif
   if (len <= 0 || len > (int) nPubkeyLen)
     return 0;
 
   memset(pubkey, 0, nPubkeyLen);
+#if !defined(USE_OPENSSL) || defined(LIBRESSL_VERSION_NUMBER) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
   MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
+#else
+  MP_setbin(DH_get0_pub_key(dh), pubkey + (nPubkeyLen - len), len);
+#endif
   return 1;
 }
 
@@ -364,7 +407,11 @@ DHComputeSharedSecretKey(MDH *dh, uint8_
   MP_gethex(q1, Q1024, len);
   assert(len);
 
+#if !defined(USE_OPENSSL) || defined(LIBRESSL_VERSION_NUMBER) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
   if (isValidPublicKey(pubkeyBn, dh->p, q1))
+#else
+  if (isValidPublicKey(pubkeyBn, DH_get0_p(dh), q1))
+#endif
     res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh);
   else
     res = -1;




--- librtmp/handshake.h.orig	2016-02-29 01:15:13 UTC
+++ librtmp/handshake.h
@@ -31,9 +31,13 @@
 #define SHA256_DIGEST_LENGTH	32
 #endif
 #define HMAC_CTX	sha2_context
-#define HMAC_setup(ctx, key, len)	sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
-#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(&ctx, buf, len)
-#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
+#define HMAC_setup(ctx, key, len)	do { \
+		if (ctx == NULL) \
+			ctx = calloc(1, sizeof(*ctx)); \
+		sha2_hmac_starts(ctx, (unsigned char *)key, len, 0); \
+	} while (0)
+#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(ctx, buf, len)
+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
 
 typedef arc4_context *	RC4_handle;
 #define RC4_alloc(h)	*h = malloc(sizeof(arc4_context))
@@ -50,10 +54,17 @@ typedef arc4_context *	RC4_handle;
 #endif
 #undef HMAC_CTX
 #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)
-#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
-#define HMAC_close(ctx)
+#define HMAC_setup(ctx, key, len)	do { \
+		if (ctx == NULL) \
+			ctx = calloc(1, sizeof(*ctx)); \
+		hmac_sha256_set_key(ctx, len, key); \
+	} while (0)
+#define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(ctx, len, buf)
+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
+#define HMAC_close(ctx)	do { \
+		free(ctx); \
+		ctx = NULL; \
+	} while (0)
 
 typedef struct arcfour_ctx*	RC4_handle;
 #define RC4_alloc(h)	*h = malloc(sizeof(struct arcfour_ctx))
@@ -69,9 +80,37 @@ typedef struct arcfour_ctx*	RC4_handle;
 #if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH)
 #error Your OpenSSL is too old, need 0.9.8 or newer with SHA256
 #endif
-#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0)
-#define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, buf, len)
-#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#define HMAC_setup(ctx, key, len)	do { \
+		if (ctx == NULL) \
+			ctx = calloc(1, sizeof(*ctx)); \
+		HMAC_CTX_init(ctx); \
+		HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0); \
+	} while (0)
+#else
+#define HMAC_setup(ctx, key, len)	do { \
+		if (ctx == NULL) \
+			ctx = HMAC_CTX_new(); \
+		else \
+			HMAC_CTX_reset(ctx); \
+		HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0); \
+	} while (0)
+#endif
+#define HMAC_crunch(ctx, buf, len)	HMAC_Update(ctx, buf, len)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#define HMAC_finish(ctx, dig, dlen)	do { \
+		HMAC_Final(ctx, dig, &dlen); \
+		HMAC_CTX_cleanup(ctx); \
+		free(ctx); \
+		ctx = NULL; \
+	} while (0)
+#else
+#define HMAC_finish(ctx, dig, dlen)	do { \
+		HMAC_Final(ctx, dig, &dlen); \
+		HMAC_CTX_free(ctx); \
+		ctx = NULL; \
+	} while (0)
+#endif
 
 typedef RC4_KEY *	RC4_handle;
 #define RC4_alloc(h)	*h = malloc(sizeof(RC4_KEY))
@@ -117,7 +156,7 @@ static void InitRC4Encryption
 {
   uint8_t digest[SHA256_DIGEST_LENGTH];
   unsigned int digestLen = 0;
-  HMAC_CTX ctx;
+  HMAC_CTX *ctx = NULL;
 
   RC4_alloc(rc4keyIn);
   RC4_alloc(rc4keyOut);
@@ -266,7 +305,7 @@ HMACsha256(const uint8_t *message, size_
 	   size_t keylen, uint8_t *digest)
 {
   unsigned int digestLen;
-  HMAC_CTX ctx;
+  HMAC_CTX *ctx = NULL;
 
   HMAC_setup(ctx, key, keylen);
   HMAC_crunch(ctx, message, messageLen);




--- librtmp/hashswf.c.orig	2019-03-30 21:33:00 UTC
+++ librtmp/hashswf.c
@@ -37,10 +37,17 @@
 #define SHA256_DIGEST_LENGTH	32
 #endif
 #define HMAC_CTX	sha2_context
-#define HMAC_setup(ctx, key, len)	sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
-#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(&ctx, buf, len)
-#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
-#define HMAC_close(ctx)
+#define HMAC_setup(ctx, key, len)	do { \
+		if (ctx == NULL) \
+			ctx = calloc(1, sizeof(*ctx)); \
+		sha2_hmac_starts(ctx, (unsigned char *)key, len, 0); \
+	} while (0);
+#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(ctx, buf, len)
+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
+#define HMAC_close(ctx)	do { \
+		free(ctx); \
+		ctx = NULL; \
+	} while (0)
 #elif defined(USE_GNUTLS)
 #include <nettle/hmac.h>
 #ifndef SHA256_DIGEST_LENGTH
@@ -48,20 +55,52 @@
 #endif
 #undef HMAC_CTX
 #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)
-#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
-#define HMAC_close(ctx)
+#define HMAC_setup(ctx, key, len)	do { \
+		if (ctx == NULL) \
+			ctx = calloc(1, sizeof(*ctx)); \
+		hmac_sha256_set_key(ctx, len, key); \
+	} while (0)
+#define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(ctx, len, buf)
+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
+#define HMAC_close(ctx)	do { \
+		free(ctx); \
+		ctx = NULL; \
+	} while (0)
 #else	/* USE_OPENSSL */
 #include <openssl/ssl.h>
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
 #include <openssl/rc4.h>
-#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0)
-#define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, (unsigned char *)buf, len)
-#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(&ctx, (unsigned char *)dig, &dlen);
-#define HMAC_close(ctx)	HMAC_CTX_cleanup(&ctx)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#define HMAC_setup(ctx, key, len)	do { \
+		if (ctx == NULL) \
+			ctx = calloc(1, sizeof(*ctx)); \
+		HMAC_CTX_init(ctx); \
+		HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0); \
+	} while (0)
+#else
+#define HMAC_setup(ctx, key, len)	do { \
+		if (ctx == NULL) \
+			ctx = HMAC_CTX_new(); \
+		HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0); \
+	} while (0);
 #endif
+#define HMAC_crunch(ctx, buf, len)	HMAC_Update(ctx, (unsigned char *)buf, len)
+#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(ctx, (unsigned char *)dig, &dlen);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#define HMAC_close(ctx)	do { \
+		HMAC_CTX_cleanup(ctx); \
+		free(ctx); \
+		ctx = NULL; \
+	} while (0)
+#else
+#define HMAC_close(ctx)	do { \
+		HMAC_CTX_reset(ctx); \
+		HMAC_CTX_free(ctx); \
+		ctx = NULL; \
+	} while (0)
+#endif
+#endif
 
 extern void RTMP_TLS_Init();
 extern TLS_CTX RTMP_TLS_ctx;
@@ -298,7 +337,7 @@ struct info
 struct info
 {
   z_stream *zs;
-  HMAC_CTX ctx;
+  HMAC_CTX *ctx;
   int first;
   int zlib;
   int size;

Lines 1-11 Link Here

(-)./files/patch-librtmp-librtmp.pc.in (-11 lines)
1	--- librtmp/librtmp.pc.in.orig 2016-02-29 01:15:13 UTC
2	+++ librtmp/librtmp.pc.in
3	@@ -8,6 +8,6 @@ Description: RTMP implementation
4	Version: @VERSION@
5	Requires: @CRYPTO_REQ@
6	URL: http://rtmpdump.mplayerhq.hu
7	-Libs: -L${libdir} -lrtmp -lz @PUBLIC_LIBS@
8	+Libs: -L${libdir} -L@OPENSSLLIB@ -lrtmp -lz @PUBLIC_LIBS@
9	Libs.private: @PRIVATE_LIBS@
10	-Cflags: -I${incdir}
11	+Cflags: -I${incdir} -I@OPENSSLINC@

Line 0 Link Here

(-)./files/patch-librtmp.pc.in (+11 lines)
	1	--- librtmp.pc.in.orig 2013-09-23 19:49:58 UTC
	2	+++ librtmp.pc.in
	3	@@ -8,6 +8,6 @@ Description: RTMP implementation
	4	Version: @VERSION@
	5	Requires: @CRYPTO_REQ@
	6	URL: http://rtmpdump.mplayerhq.hu
	7	-Libs: -L${libdir} -lrtmp -lz @PUBLIC_LIBS@
	8	+Libs: -L${libdir} -L@OPENSSLLIB@ -lrtmp -lz @PUBLIC_LIBS@
	9	Libs.private: @PRIVATE_LIBS@
	10	-Cflags: -I${incdir}
	11	+Cflags: -I${incdir} -I@OPENSSLINC@

Line 1 Link Here

(-)./pkg-descr (-1 / +3 lines)
1	librtmp is the library part of rtmpdump.	1	librtmp - RTMPDump Real-time Messaging Protocol API
		2
		3	This library part is part of rtmpdump.

Return to bug 277418

Lines 1-8 Link Here

(-)./Makefile (-6 / +5 lines)
1	PORTNAME= librtmp	1	PORTNAME= librtmp
2	PORTVERSION= 2.4.20190330	2	PORTVERSION= 2.6
3	PORTREVISION= 1
4	CATEGORIES= multimedia net	3	CATEGORIES= multimedia net
5	MASTER_SITES= https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz?/	4	MASTER_SITES= ${MASTER_SITE_LOCAL}
		5	MASTER_SITE_SUBDIR= je3kmz
6	DISTNAME= rtmpdump-${PORTVERSION}	6	DISTNAME= rtmpdump-${PORTVERSION}
7		7
8	MAINTAINER= hrs@FreeBSD.org	8	MAINTAINER= hrs@FreeBSD.org
Lines 12-23 WWW= https://rtmpdump.mplayerhq.hu/ Link Here
12	LICENSE= LGPL21+	12	LICENSE= LGPL21+
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	USES= pkgconfig ssl	15	USES= pkgconfig ssl tar:xz
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17		17
18	CFLAGS+= -I${OPENSSLINC}	18	CFLAGS+= -I${OPENSSLINC}
19	LDFLAGS+= -L${OPENSSLLIB}	19	LDFLAGS+= -L${OPENSSLLIB}
20	PATCH_WRKSRC= ${WRKDIR}/rtmpdump-c5f04a5	20	WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME}
21	WRKSRC= ${WRKDIR}/rtmpdump-c5f04a5/${PORTNAME}
22		21
23	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Line 0 Link Here

(-)./files/patch-Makefile (+88 lines)
		1	--- Makefile.orig 2021-02-19 17:54:54 UTC
		2	+++ Makefile
		3	@@ -1,19 +1,21 @@
		4	VERSION=v2.4
		5
		6	-prefix=/usr/local
		7	+prefix=$(PREFIX)
		8
		9	incdir=$(prefix)/include/librtmp
		10	bindir=$(prefix)/bin
		11	libdir=$(prefix)/lib
		12	-mandir=$(prefix)/man
		13	+libdatadir=$(prefix)/libdata
		14	+mandir=$(prefix)/share/man
		15	BINDIR=$(DESTDIR)$(bindir)
		16	INCDIR=$(DESTDIR)$(incdir)
		17	LIBDIR=$(DESTDIR)$(libdir)
		18	+LIBDATADIR=$(DESTDIR)$(libdatadir)
		19	MANDIR=$(DESTDIR)$(mandir)
		20
		21	-CC=$(CROSS_COMPILE)gcc
		22	-LD=$(CROSS_COMPILE)ld
		23	-AR=$(CROSS_COMPILE)ar
		24	+CC?=$(CROSS_COMPILE)gcc
		25	+LD?=$(CROSS_COMPILE)ld
		26	+AR?=$(CROSS_COMPILE)ar
		27
		28	SYS=posix
		29	CRYPTO=OPENSSL
		30	@@ -23,14 +25,14 @@ DEF_OPENSSL=-DUSE_OPENSSL
		31	DEF_GNUTLS=-DUSE_GNUTLS
		32	DEF_=-DNO_CRYPTO
		33	REQ_GNUTLS=gnutls,hogweed,nettle
		34	-REQ_OPENSSL=libssl,libcrypto
		35	+#REQ_OPENSSL=libssl,libcrypto
		36	PUB_GNUTLS=-lgmp
		37	LIBZ=-lz
		38	LIBS_posix=
		39	LIBS_darwin=
		40	LIBS_mingw=-lws2_32 -lwinmm -lgdi32
		41	LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
		42	-LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
		43	+LIB_OPENSSL=-L$(OPENSSLLIB) -lssl -lcrypto $(LIBZ)
		44	LIB_POLARSSL=-lpolarssl $(LIBZ)
		45	PRIVATE_LIBS=$(LIBS_$(SYS))
		46	CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS)
		47	@@ -74,8 +76,9 @@ SO_INST=$(SOINST_$(SHARED))
		48
		49	DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
		50	OPT=-O2
		51	-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
		52	-LDFLAGS=$(XLDFLAGS)
		53	+#CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
		54	+CFLAGS+=$(OPT) $(SO_DEF)
		55	+#LDFLAGS=$(XLDFLAGS)
		56
		57
		58	OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
		59	@@ -102,21 +105,23 @@ librtmp.pc: librtmp.pc.in Makefile
		60	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
		61	-e "s;@VERSION@;$(VERSION);" \
		62	-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
		63	+ -e "s;@OPENSSLLIB@;$(OPENSSLLIB);" \
		64	+ -e "s;@OPENSSLINC@;$(OPENSSLINC);" \
65	-e "s;@PUBLIC_LIBS@;$(PUBLIC_LIBS);" \
66	-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
67
68	install: install_base $(SO_INST)
69
70	install_base: librtmp.a librtmp.pc
71	- -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3
72	- cp amf.h http.h log.h rtmp.h $(INCDIR)
73	- cp librtmp.a $(LIBDIR)
74	- cp librtmp.pc $(LIBDIR)/pkgconfig
75	- cp librtmp.3 $(MANDIR)/man3
76	+ -mkdir -p $(INCDIR) $(LIBDATADIR)/pkgconfig $(MANDIR)/man3
77	+ ${BSD_INSTALL_DATA} amf.h http.h log.h rtmp.h $(INCDIR)
78	+ ${BSD_INSTALL_DATA} librtmp.a $(LIBDIR)
79	+ ${BSD_INSTALL_DATA} librtmp.pc $(LIBDATADIR)/pkgconfig
80	+ ${BSD_INSTALL_DATA} librtmp.3 $(MANDIR)/man3
81
82	install_so: librtmp$(SO_EXT)
83	-mkdir -p $(SODIR)
84	- cp librtmp$(SO_EXT) $(SODIR)
85	+ ${BSD_INSTALL_LIB} librtmp$(SO_EXT) $(SODIR)
86	$(INSTALL_IMPLIB)
87	cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX)
88

Lines 1-84 Link Here

(-)./files/patch-librtmp-Makefile (-84 lines)
1	--- librtmp/Makefile.orig 2019-03-30 21:33:00 UTC
2	+++ librtmp/Makefile
3	@@ -1,19 +1,21 @@ VERSION=v2.4
4	VERSION=v2.4
5
6	-prefix=/usr/local
7	+prefix=$(PREFIX)
8
9	incdir=$(prefix)/include/librtmp
10	bindir=$(prefix)/bin
11	libdir=$(prefix)/lib
12	-mandir=$(prefix)/man
13	+libdatadir=$(prefix)/libdata
14	+mandir=$(prefix)/share/man
15	BINDIR=$(DESTDIR)$(bindir)
16	INCDIR=$(DESTDIR)$(incdir)
17	LIBDIR=$(DESTDIR)$(libdir)
18	+LIBDATADIR=$(DESTDIR)$(libdatadir)
19	MANDIR=$(DESTDIR)$(mandir)
20
21	-CC=$(CROSS_COMPILE)gcc
22	-LD=$(CROSS_COMPILE)ld
23	-AR=$(CROSS_COMPILE)ar
24	+CC?=$(CROSS_COMPILE)gcc
25	+LD?=$(CROSS_COMPILE)ld
26	+AR?=$(CROSS_COMPILE)ar
27
28	SYS=posix
29	CRYPTO=OPENSSL
30	@@ -23,14 +25,14 @@ REQ_GNUTLS=gnutls,hogweed,nettle
31	DEF_GNUTLS=-DUSE_GNUTLS
32	DEF_=-DNO_CRYPTO
33	REQ_GNUTLS=gnutls,hogweed,nettle
34	-REQ_OPENSSL=libssl,libcrypto
35	+#REQ_OPENSSL=libssl,libcrypto
36	PUB_GNUTLS=-lgmp
37	LIBZ=-lz
38	LIBS_posix=
39	LIBS_darwin=
40	LIBS_mingw=-lws2_32 -lwinmm -lgdi32
41	LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
42	-LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
43	+LIB_OPENSSL=-L$(OPENSSLLIB) -lssl -lcrypto $(LIBZ)
44	LIB_POLARSSL=-lpolarssl $(LIBZ)
45	PRIVATE_LIBS=$(LIBS_$(SYS))
46	CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS)
47	@@ -74,8 +76,9 @@ OPT=-O2
48
49	DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
50	OPT=-O2
51	-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
52	-LDFLAGS=$(XLDFLAGS)
53	+#CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
54	+CFLAGS+=$(DEF) $(SO_DEF)
55	+#LDFLAGS=$(XLDFLAGS)
56
57
58	OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
59	@@ -102,20 +105,22 @@ librtmp.pc: librtmp.pc.in Makefile
60	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
61	-e "s;@VERSION@;$(VERSION);" \
62	-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
63	+ -e "s;@OPENSSLLIB@;$(OPENSSLLIB);" \
64	+ -e "s;@OPENSSLINC@;$(OPENSSLINC);" \
65	-e "s;@PUBLIC_LIBS@;$(PUBLIC_LIBS);" \
66	-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
67
68	install: install_base $(SO_INST)
69
70	install_base: librtmp.a librtmp.pc
71	- -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
72	+ -mkdir -p $(INCDIR) $(LIBDATADIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
73	cp amf.h http.h log.h rtmp.h $(INCDIR)
74	cp librtmp.a $(LIBDIR)
75	- cp librtmp.pc $(LIBDIR)/pkgconfig
76	+ cp librtmp.pc $(LIBDATADIR)/pkgconfig
77	cp librtmp.3 $(MANDIR)/man3
78
79	install_so: librtmp$(SO_EXT)
80	- cp librtmp$(SO_EXT) $(SODIR)
81	+ ${BSD_INSTALL_LIB} librtmp$(SO_EXT) $(SODIR)
82	$(INSTALL_IMPLIB)
83	cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX)
84

Lines 1-116 Link Here

(-)./files/patch-librtmp-dh.h (-116 lines)
1	--- librtmp/dh.h.orig 2016-02-29 01:15:13 UTC
2	+++ librtmp/dh.h
3	@@ -194,7 +194,7 @@ typedef BIGNUM * MP_t;
4
5	/* RFC 2631, Section 2.1.5, http://www.ietf.org/rfc/rfc2631.txt */
6	static int
7	-isValidPublicKey(MP_t y, MP_t p, MP_t q)
8	+isValidPublicKey(const MP_t y, const MP_t p, const MP_t q)
9	{
10	int ret = TRUE;
11	MP_t bn;
12	@@ -253,20 +253,43 @@ DHInit(int nKeyBits)
13	if (!dh)
14	goto failed;
15
16	+#if !defined(USE_OPENSSL) \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
17	MP_new(dh->g);
18
19	if (!dh->g)
20	goto failed;
21	+#else
22	+ BIGNUM *g;
23
24	+ MP_new(g);
25	+ if (g == NULL)
26	+ goto failed;
27	+#endif
28	+
29	+#if !defined(USE_OPENSSL) \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
30	MP_gethex(dh->p, P1024, res); /* prime P1024, see dhgroups.h */
31	+#else
32	+ const BIGNUM *p = DH_get0_p(dh);
33	+
34	+ MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */
35	+#endif
36	if (!res)
37	{
38	goto failed;
39	}
40
41	+#if !defined(USE_OPENSSL) \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
42	MP_set_w(dh->g, 2); /* base 2 */
43	+#else
44	+ MP_set_w(g, 2); /* base 2 */
45	+ DH_set0_pqg(dh, p, NULL, g);
46	+#endif
47
48	+#if !defined(USE_OPENSSL) \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
49	dh->length = nKeyBits;
50	+#else
51	+ DH_set_length(dh, nKeyBits);
52	+#endif
53	return dh;
54
55	failed:
56	@@ -293,12 +316,20 @@ DHGenerateKey(MDH *dh)
57	MP_gethex(q1, Q1024, res);
58	assert(res);
59
60	+#if !defined(USE_OPENSSL) \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
61	res = isValidPublicKey(dh->pub_key, dh->p, q1);
62	+#else
63	+ res = isValidPublicKey(DH_get0_pub_key(dh), DH_get0_p(dh), q1);
64	+#endif
65	if (!res)
66	{
67	+#if !defined(USE_OPENSSL) \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
68	MP_free(dh->pub_key);
69	MP_free(dh->priv_key);
70	dh->pub_key = dh->priv_key = 0;
71	+#else
72	+ DH_set0_key(dh, NULL, NULL);
73	+#endif
74	}
75
76	MP_free(q1);
77	@@ -314,15 +345,27 @@ static int
78	DHGetPublicKey(MDH dh, uint8_t pubkey, size_t nPubkeyLen)
79	{
80	int len;
81	+#if !defined(USE_OPENSSL) \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
82	if (!dh \|\| !dh->pub_key)
83	+#else
84	+ if (!dh \|\| !DH_get0_pub_key(dh))
85	+#endif
86	return 0;
87
88	+#if !defined(USE_OPENSSL) \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
89	len = MP_bytes(dh->pub_key);
90	+#else
91	+ len = MP_bytes(DH_get0_pub_key(dh));
92	+#endif
93	if (len <= 0 \|\| len > (int) nPubkeyLen)
94	return 0;
95
96	memset(pubkey, 0, nPubkeyLen);
97	+#if !defined(USE_OPENSSL) \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
98	MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
99	+#else
100	+ MP_setbin(DH_get0_pub_key(dh), pubkey + (nPubkeyLen - len), len);
101	+#endif
102	return 1;
103	}
104
105	@@ -364,7 +407,11 @@ DHComputeSharedSecretKey(MDH *dh, uint8_
106	MP_gethex(q1, Q1024, len);
107	assert(len);
108
109	+#if !defined(USE_OPENSSL) \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
110	if (isValidPublicKey(pubkeyBn, dh->p, q1))
111	+#else
112	+ if (isValidPublicKey(pubkeyBn, DH_get0_p(dh), q1))
113	+#endif
114	res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh);
115	else
116	res = -1;

Lines 1-100 Link Here

(-)./files/patch-librtmp-handshake.h (-100 lines)
1	--- librtmp/handshake.h.orig 2016-02-29 01:15:13 UTC
2	+++ librtmp/handshake.h
3	@@ -31,9 +31,13 @@
4	#define SHA256_DIGEST_LENGTH 32
5	#endif
6	#define HMAC_CTX sha2_context
7	-#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
8	-#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len)
9	-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
10	+#define HMAC_setup(ctx, key, len) do { \
11	+ if (ctx == NULL) \
12	+ ctx = calloc(1, sizeof(*ctx)); \
13	+ sha2_hmac_starts(ctx, (unsigned char *)key, len, 0); \
14	+ } while (0)
15	+#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(ctx, buf, len)
16	+#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
17
18	typedef arc4_context * RC4_handle;
19	#define RC4_alloc(h) *h = malloc(sizeof(arc4_context))
20	@@ -50,10 +54,17 @@ typedef arc4_context * RC4_handle;
21	#endif
22	#undef HMAC_CTX
23	#define HMAC_CTX struct hmac_sha256_ctx
24	-#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key)
25	-#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf)
26	-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
27	-#define HMAC_close(ctx)
28	+#define HMAC_setup(ctx, key, len) do { \
29	+ if (ctx == NULL) \
30	+ ctx = calloc(1, sizeof(*ctx)); \
31	+ hmac_sha256_set_key(ctx, len, key); \
32	+ } while (0)
33	+#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(ctx, len, buf)
34	+#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
35	+#define HMAC_close(ctx) do { \
36	+ free(ctx); \
37	+ ctx = NULL; \
38	+ } while (0)
39
40	typedef struct arcfour_ctx* RC4_handle;
41	#define RC4_alloc(h) *h = malloc(sizeof(struct arcfour_ctx))
42	@@ -69,9 +80,37 @@ typedef struct arcfour_ctx* RC4_handle;
43	#if OPENSSL_VERSION_NUMBER < 0x0090800 \|\| !defined(SHA256_DIGEST_LENGTH)
44	#error Your OpenSSL is too old, need 0.9.8 or newer with SHA256
45	#endif
46	-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0)
47	-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, buf, len)
48	-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx)
49	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
50	+#define HMAC_setup(ctx, key, len) do { \
51	+ if (ctx == NULL) \
52	+ ctx = calloc(1, sizeof(*ctx)); \
53	+ HMAC_CTX_init(ctx); \
54	+ HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0); \
55	+ } while (0)
56	+#else
57	+#define HMAC_setup(ctx, key, len) do { \
58	+ if (ctx == NULL) \
59	+ ctx = HMAC_CTX_new(); \
60	+ else \
61	+ HMAC_CTX_reset(ctx); \
62	+ HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0); \
63	+ } while (0)
64	+#endif
65	+#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, buf, len)
66	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
67	+#define HMAC_finish(ctx, dig, dlen) do { \
68	+ HMAC_Final(ctx, dig, &dlen); \
69	+ HMAC_CTX_cleanup(ctx); \
70	+ free(ctx); \
71	+ ctx = NULL; \
72	+ } while (0)
73	+#else
74	+#define HMAC_finish(ctx, dig, dlen) do { \
75	+ HMAC_Final(ctx, dig, &dlen); \
76	+ HMAC_CTX_free(ctx); \
77	+ ctx = NULL; \
78	+ } while (0)
79	+#endif
80
81	typedef RC4_KEY * RC4_handle;
82	#define RC4_alloc(h) *h = malloc(sizeof(RC4_KEY))
83	@@ -117,7 +156,7 @@ static void InitRC4Encryption
84	{
85	uint8_t digest[SHA256_DIGEST_LENGTH];
86	unsigned int digestLen = 0;
87	- HMAC_CTX ctx;
88	+ HMAC_CTX *ctx = NULL;
89
90	RC4_alloc(rc4keyIn);
91	RC4_alloc(rc4keyOut);
92	@@ -266,7 +305,7 @@ HMACsha256(const uint8_t *message, size_
93	size_t keylen, uint8_t *digest)
94	{
95	unsigned int digestLen;
96	- HMAC_CTX ctx;
97	+ HMAC_CTX *ctx = NULL;
98
99	HMAC_setup(ctx, key, keylen);
100	HMAC_crunch(ctx, message, messageLen);

Lines 1-94 Link Here

(-)./files/patch-librtmp-hashswf.c (-94 lines)
1	--- librtmp/hashswf.c.orig 2019-03-30 21:33:00 UTC
2	+++ librtmp/hashswf.c
3	@@ -37,10 +37,17 @@
4	#define SHA256_DIGEST_LENGTH 32
5	#endif
6	#define HMAC_CTX sha2_context
7	-#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
8	-#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len)
9	-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
10	-#define HMAC_close(ctx)
11	+#define HMAC_setup(ctx, key, len) do { \
12	+ if (ctx == NULL) \
13	+ ctx = calloc(1, sizeof(*ctx)); \
14	+ sha2_hmac_starts(ctx, (unsigned char *)key, len, 0); \
15	+ } while (0);
16	+#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(ctx, buf, len)
17	+#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
18	+#define HMAC_close(ctx) do { \
19	+ free(ctx); \
20	+ ctx = NULL; \
21	+ } while (0)
22	#elif defined(USE_GNUTLS)
23	#include <nettle/hmac.h>
24	#ifndef SHA256_DIGEST_LENGTH
25	@@ -48,20 +55,52 @@
26	#endif
27	#undef HMAC_CTX
28	#define HMAC_CTX struct hmac_sha256_ctx
29	-#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key)
30	-#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf)
31	-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
32	-#define HMAC_close(ctx)
33	+#define HMAC_setup(ctx, key, len) do { \
34	+ if (ctx == NULL) \
35	+ ctx = calloc(1, sizeof(*ctx)); \
36	+ hmac_sha256_set_key(ctx, len, key); \
37	+ } while (0)
38	+#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(ctx, len, buf)
39	+#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
40	+#define HMAC_close(ctx) do { \
41	+ free(ctx); \
42	+ ctx = NULL; \
43	+ } while (0)
44	#else /* USE_OPENSSL */
45	#include <openssl/ssl.h>
46	#include <openssl/sha.h>
47	#include <openssl/hmac.h>
48	#include <openssl/rc4.h>
49	-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0)
50	-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, (unsigned char *)buf, len)
51	-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, (unsigned char *)dig, &dlen);
52	-#define HMAC_close(ctx) HMAC_CTX_cleanup(&ctx)
53	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
54	+#define HMAC_setup(ctx, key, len) do { \
55	+ if (ctx == NULL) \
56	+ ctx = calloc(1, sizeof(*ctx)); \
57	+ HMAC_CTX_init(ctx); \
58	+ HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0); \
59	+ } while (0)
60	+#else
61	+#define HMAC_setup(ctx, key, len) do { \
62	+ if (ctx == NULL) \
63	+ ctx = HMAC_CTX_new(); \
64	+ HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0); \
65	+ } while (0);
66	#endif
67	+#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, (unsigned char *)buf, len)
68	+#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, (unsigned char *)dig, &dlen);
69	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
70	+#define HMAC_close(ctx) do { \
71	+ HMAC_CTX_cleanup(ctx); \
72	+ free(ctx); \
73	+ ctx = NULL; \
74	+ } while (0)
75	+#else
76	+#define HMAC_close(ctx) do { \
77	+ HMAC_CTX_reset(ctx); \
78	+ HMAC_CTX_free(ctx); \
79	+ ctx = NULL; \
80	+ } while (0)
81	+#endif
82	+#endif
83
84	extern void RTMP_TLS_Init();
85	extern TLS_CTX RTMP_TLS_ctx;
86	@@ -298,7 +337,7 @@ struct info
87	struct info
88	{
89	z_stream *zs;
90	- HMAC_CTX ctx;
91	+ HMAC_CTX *ctx;
92	int first;
93	int zlib;
94	int size;