aboutsummaryrefslogtreecommitdiff
path: root/ports/librtmp
diff options
context:
space:
mode:
Diffstat (limited to 'ports/librtmp')
-rw-r--r--ports/librtmp/CONTROL2
-rw-r--r--ports/librtmp/dh.patch136
-rw-r--r--ports/librtmp/handshake.patch35
-rw-r--r--ports/librtmp/hashswf.patch28
-rw-r--r--ports/librtmp/portfile.cmake3
5 files changed, 203 insertions, 1 deletions
diff --git a/ports/librtmp/CONTROL b/ports/librtmp/CONTROL
index 5724eefe2..9afbe903f 100644
--- a/ports/librtmp/CONTROL
+++ b/ports/librtmp/CONTROL
@@ -1,5 +1,5 @@
Source: librtmp
-Version: 2019-11-11
+Version: 2019-11-11_1
Build-Depends: zlib, openssl
Homepage: https://rtmpdump.mplayerhq.hu
Description: RTMPDump Real-Time Messaging Protocol API
diff --git a/ports/librtmp/dh.patch b/ports/librtmp/dh.patch
new file mode 100644
index 000000000..4b0345354
--- /dev/null
+++ b/ports/librtmp/dh.patch
@@ -0,0 +1,136 @@
+diff --git a/librtmp/dh.h b/librtmp/dh.h
+index 8e285a60c..ea562d200 100644
+--- a/librtmp/dh.h
++++ b/librtmp/dh.h
+@@ -139,11 +139,14 @@ typedef BIGNUM * MP_t;
+ #define MP_setbin(u,buf,len) BN_bn2bin(u,buf)
+ #define MP_getbin(u,buf,len) u = BN_bin2bn(buf,len,0)
+
++
+ #define MDH DH
+ #define MDH_new() DH_new()
+ #define MDH_free(dh) DH_free(dh)
+ #define MDH_generate_key(dh) DH_generate_key(dh)
+ #define MDH_compute_key(secret, seclen, pub, dh) DH_compute_key(secret, pub, dh)
++#define MPH_set_pqg(dh, p, q, g, res) res = DH_set0_pqg(dh, p, q, g)
++#define MPH_set_length(dh, len, res) res = DH_set_length(dh,len)
+
+ #endif
+
+@@ -152,7 +155,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, MP_t q)
+ {
+ int ret = TRUE;
+ MP_t bn;
+@@ -211,20 +214,33 @@ DHInit(int nKeyBits)
+ if (!dh)
+ goto failed;
+
+- MP_new(dh->g);
++ MP_t g,p;
++ MP_new(g);
+
+- if (!dh->g)
++ if (!g)
++ {
+ goto failed;
++ }
+
+- MP_gethex(dh->p, P1024, res); /* prime P1024, see dhgroups.h */
++ DH_get0_pqg(dh, (BIGNUM const**)&p, NULL, NULL);
++ MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */
+ if (!res)
+ {
+ goto failed;
+ }
+
+- MP_set_w(dh->g, 2); /* base 2 */
+-
+- dh->length = nKeyBits;
++ MP_set_w(g, 2); /* base 2 */
++ MPH_set_pqg(dh,p,NULL,g, res);
++ if (!res)
++ {
++ MP_free(g);
++ goto failed;
++ }
++ MPH_set_length(dh,nKeyBits, res);
++ if (!res)
++ {
++ goto failed;
++ }
+ return dh;
+
+ failed:
+@@ -250,14 +267,11 @@ DHGenerateKey(MDH *dh)
+
+ MP_gethex(q1, Q1024, res);
+ assert(res);
+-
+- res = isValidPublicKey(dh->pub_key, dh->p, q1);
++ res = isValidPublicKey(DH_get0_pub_key(dh), DH_get0_p(dh), q1);
+ if (!res)
+- {
+- MP_free(dh->pub_key);
+- MP_free(dh->priv_key);
+- dh->pub_key = dh->priv_key = 0;
+- }
++ {
++ MDH_free(dh); // Cannot set priv_key to nullptr so there is no way to generate a new pub/priv key pair in openssl 1.1.1.
++ }
+
+ MP_free(q1);
+ }
+@@ -272,15 +286,16 @@ static int
+ DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
+ {
+ int len;
+- if (!dh || !dh->pub_key)
++ MP_t pub = DH_get0_pub_key(dh);
++ if (!dh || !pub)
+ return 0;
+
+- len = MP_bytes(dh->pub_key);
++ len = MP_bytes(pub);
+ if (len <= 0 || len > (int) nPubkeyLen)
+ return 0;
+
+ memset(pubkey, 0, nPubkeyLen);
+- MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
++ MP_setbin(pub, pubkey + (nPubkeyLen - len), len);
+ return 1;
+ }
+
+@@ -288,15 +303,16 @@ DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
+ static int
+ DHGetPrivateKey(MDH *dh, uint8_t *privkey, size_t nPrivkeyLen)
+ {
+- if (!dh || !dh->priv_key)
++ MP_t priv = DH_get0_priv_key(dh);
++ if (!dh || !priv)
+ return 0;
+
+- int len = MP_bytes(dh->priv_key);
++ int len = MP_bytes(priv);
+ if (len <= 0 || len > (int) nPrivkeyLen)
+ return 0;
+
+ memset(privkey, 0, nPrivkeyLen);
+- MP_setbin(dh->priv_key, privkey + (nPrivkeyLen - len), len);
++ MP_setbin(priv, privkey + (nPrivkeyLen - len), len);
+ return 1;
+ }
+ #endif
+@@ -322,7 +338,7 @@ DHComputeSharedSecretKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen,
+ MP_gethex(q1, Q1024, len);
+ assert(len);
+
+- if (isValidPublicKey(pubkeyBn, dh->p, q1))
++ if (isValidPublicKey(pubkeyBn, DH_get0_p(dh), q1))
+ res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh);
+ else
+ res = -1;
diff --git a/ports/librtmp/handshake.patch b/ports/librtmp/handshake.patch
new file mode 100644
index 000000000..88f5d2458
--- /dev/null
+++ b/ports/librtmp/handshake.patch
@@ -0,0 +1,35 @@
+diff --git a/librtmp/handshake.h b/librtmp/handshake.h
+index 98bf3c877..0819152bd 100644
+--- a/librtmp/handshake.h
++++ b/librtmp/handshake.h
+@@ -66,9 +66,9 @@ typedef gcry_cipher_hd_t 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) ctx = HMAC_CTX_new(); 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))
+@@ -114,7 +114,7 @@ static void InitRC4Encryption
+ {
+ uint8_t digest[SHA256_DIGEST_LENGTH];
+ unsigned int digestLen = 0;
+- HMAC_CTX ctx;
++ HMAC_CTX *ctx;
+
+ RC4_alloc(rc4keyIn);
+ RC4_alloc(rc4keyOut);
+@@ -263,7 +263,7 @@ HMACsha256(const uint8_t *message, size_t messageLen, const uint8_t *key,
+ size_t keylen, uint8_t *digest)
+ {
+ unsigned int digestLen;
+- HMAC_CTX ctx;
++ HMAC_CTX *ctx;
+
+ HMAC_setup(ctx, key, keylen);
+ HMAC_crunch(ctx, message, messageLen);
diff --git a/ports/librtmp/hashswf.patch b/ports/librtmp/hashswf.patch
new file mode 100644
index 000000000..fb29549f3
--- /dev/null
+++ b/ports/librtmp/hashswf.patch
@@ -0,0 +1,28 @@
+diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c
+index 3c56b6922..964a64d01 100644
+--- a/librtmp/hashswf.c
++++ b/librtmp/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) ctx = HMAC_CTX_new(); 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;
diff --git a/ports/librtmp/portfile.cmake b/ports/librtmp/portfile.cmake
index 6a1203b0f..6f4e73e3d 100644
--- a/ports/librtmp/portfile.cmake
+++ b/ports/librtmp/portfile.cmake
@@ -5,6 +5,9 @@ vcpkg_from_git(
URL https://git.ffmpeg.org/rtmpdump
REF ${RTMPDUMP_REVISION}
PATCHES
+ dh.patch #Openssl 1.1.1 patch
+ handshake.patch #Openssl 1.1.1 patch
+ hashswf.patch #Openssl 1.1.1 patch
fix_strncasecmp.patch
hide_netstackdump.patch
)
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-07 05:02:45 +0000