multimedia/librtmp: Fix build with OpenSSL 1.1.x

- Update LICENSE and add LICENSE_FILE

PR:		231940
Submitted by:	Nathan <ndowens@yahoo.com>
Reported by:	antoine
Approved by:	hrs (maintainer timeout)
Obtained from:	https://github.com/JudgeZarbi/RTMPDum-OpenSSL-1.1
MFH:		2018Q4

4 files changed, 146 insertions, 4 deletions

diff --git a/multimedia/librtmp/Makefile b/multimedia/librtmp/Makefile
index e3543e96a42d..c1b51f2ebe5e 100644
--- a/multimedia/librtmp/Makefile
+++ b/multimedia/librtmp/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	librtmp
 PORTVERSION=	2.4.20151223
+PORTREVISION=	1
 CATEGORIES=	multimedia net
 MASTER_SITES=	LOCAL/hrs
 DISTNAME=	rtmpdump-2.4.fa8646da
@@ -9,13 +10,12 @@ DISTNAME=	rtmpdump-2.4.fa8646da
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	RTMP stream library
 
-LICENSE=	GPLv2
-
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	error: incomplete definition of type 'struct dh_st'
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig tar:bz2 ssl
 USE_LDCONFIG=	yes
+
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 WRKSRC=		${WRKDIR}/${DISTNAME}/librtmp
diff --git a/multimedia/librtmp/files/patch-dh.h b/multimedia/librtmp/files/patch-dh.h
new file mode 100644
index 000000000000..f7c2ea4552f1
--- /dev/null
+++ b/multimedia/librtmp/files/patch-dh.h
@@ -0,0 +1,83 @@
+--- dh.h.orig	2016-02-29 01:15:13 UTC
++++ dh.h
+@@ -253,20 +253,23 @@ DHInit(int nKeyBits)
+   if (!dh)
+     goto failed;
+ 
+-  MP_new(dh->g);
++  const BIGNUM *p;
++  const BIGNUM *g;
++  DH_get0_pqg(dh,&p,NULL,&g);
++  MP_new(g);
+ 
+-  if (!dh->g)
++  if (!g)
+     goto failed;
+ 
+-  MP_gethex(dh->p, P1024, res);	/* prime P1024, see dhgroups.h */
++  MP_gethex(p, P1024, res);	/* prime P1024, see dhgroups.h */
+   if (!res)
+     {
+       goto failed;
+     }
+ 
+-  MP_set_w(dh->g, 2);	/* base 2 */
++  MP_set_w(g, 2);	/* base 2 */
+ 
+-  dh->length = nKeyBits;
++  DH_set_length(dh, nKeyBits);
+   return dh;
+ 
+ failed:
+@@ -293,12 +296,15 @@ DHGenerateKey(MDH *dh)
+       MP_gethex(q1, Q1024, res);
+       assert(res);
+ 
+-      res = isValidPublicKey(dh->pub_key, dh->p, q1);
++      BIGNUM *pub_key, *priv_key, *p;
++      DH_get0_key(dh, &pub_key, &priv_key);
++      DH_get0_pqg(dh,&p,NULL,NULL);
++      res = isValidPublicKey(pub_key, p, q1);
+       if (!res)
+ 	{
+-	  MP_free(dh->pub_key);
+-	  MP_free(dh->priv_key);
+-	  dh->pub_key = dh->priv_key = 0;
++	  MP_free(pub_key);
++	  MP_free(priv_key);
++          DH_set0_key(dh, 0, 0);
+ 	}
+ 
+       MP_free(q1);
+@@ -314,15 +320,17 @@ static int
+ DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
+ {
+   int len;
+-  if (!dh || !dh->pub_key)
++  BIGNUM *pub_key;
++  DH_get0_key(dh, &pub_key, NULL);
++  if (!dh || !pub_key)
+     return 0;
+ 
+-  len = MP_bytes(dh->pub_key);
++  len = MP_bytes(pub_key);
+   if (len <= 0 || len > (int) nPubkeyLen)
+     return 0;
+ 
+   memset(pubkey, 0, nPubkeyLen);
+-  MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
++  MP_setbin(pub_key, pubkey + (nPubkeyLen - len), len);
+   return 1;
+ }
+ 
+@@ -364,7 +372,9 @@ DHComputeSharedSecretKey(MDH *dh, uint8_t *pubkey, siz
+   MP_gethex(q1, Q1024, len);
+   assert(len);
+ 
+-  if (isValidPublicKey(pubkeyBn, dh->p, q1))
++  BIGNUM *p;
++  DH_get0_pqg(dh,&p,NULL,NULL);
++  if (isValidPublicKey(pubkeyBn, p, q1))
+     res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh);
+   else
+     res = -1;
diff --git a/multimedia/librtmp/files/patch-handshake.h b/multimedia/librtmp/files/patch-handshake.h
new file mode 100644
index 000000000000..95a42c92b9fb
--- /dev/null
+++ b/multimedia/librtmp/files/patch-handshake.h
@@ -0,0 +1,33 @@
+--- handshake.h.orig	2016-02-29 01:15:13 UTC
++++ handshake.h
+@@ -69,9 +69,9 @@ 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)
++#define HMAC_setup(ctx, key, len)	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_free(ctx)
+ 
+ typedef RC4_KEY *	RC4_handle;
+ #define RC4_alloc(h)	*h = malloc(sizeof(RC4_KEY))
+@@ -117,7 +117,7 @@ static void InitRC4Encryption
+ {
+   uint8_t digest[SHA256_DIGEST_LENGTH];
+   unsigned int digestLen = 0;
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx = HMAC_CTX_new();
+ 
+   RC4_alloc(rc4keyIn);
+   RC4_alloc(rc4keyOut);
+@@ -266,7 +266,7 @@ HMACsha256(const uint8_t *message, size_t messageLen, 
+ 	   size_t keylen, uint8_t *digest)
+ {
+   unsigned int digestLen;
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx = HMAC_CTX_new();
+ 
+   HMAC_setup(ctx, key, keylen);
+   HMAC_crunch(ctx, message, messageLen);
diff --git a/multimedia/librtmp/files/patch-hashswf.c b/multimedia/librtmp/files/patch-hashswf.c
new file mode 100644
index 000000000000..31a6c9006fe5
--- /dev/null
+++ b/multimedia/librtmp/files/patch-hashswf.c
@@ -0,0 +1,26 @@
+--- hashswf.c.orig	2016-02-29 01:15:13 UTC
++++ hashswf.c
+@@ -57,10 +57,10 @@
+ #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)
++#define HMAC_setup(ctx, key, len)	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_free(ctx)
+ #endif
+ 
+ extern void RTMP_TLS_Init();
+@@ -289,7 +289,7 @@ leave:
+ struct info
+ {
+   z_stream *zs;
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx;
+   int first;
+   int zlib;
+   int size;