jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4438 from jairoxyz/patch-1

Browse Source 
Update SSL 1.1 patches
This commit is contained in:
Christian Hewitt 2020-06-23 16:57:01 +04:00 committed by GitHub
commit 521e56b73c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/multimedia/rtmpdump/patches/002_build-with-openssl11.patch
View File

@ -1,9 +1,9 @@
Source: https://github.com/xbmc/inputstream.rtmp/tree/master/depends/common/librtmp Source: https://github.com/xbmc/inputstream.rtmp/tree/master/depends/common/librtmp
Date: 21. Oct 2018 Date: Feb 9, 2019
--- a/librtmp/dh.h --- a/librtmp/dh.h
+++ b/librtmp/dh.h +++ b/librtmp/dh.h
@@ -253,20 +253,44 @@ @@ -253,20 +253,42 @@
if (!dh) if (!dh)
goto failed; goto failed;
@ -17,8 +17,6 @@ Date: 21. Oct 2018
+ MP_new(g); + MP_new(g);
+ if (!g) + if (!g)
+ goto failed; + goto failed;
+
+ DH_set0_pqg(dh, NULL, g, NULL);
+#endif +#endif
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L +#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
@ -37,7 +35,7 @@ Date: 21. Oct 2018
MP_set_w(dh->g, 2); /* base 2 */ MP_set_w(dh->g, 2); /* base 2 */
+#else +#else
+ MP_set_w(g, 2); /* base 2 */ + MP_set_w(g, 2); /* base 2 */
+ DH_set0_pqg(dh, NULL, g, NULL); + DH_set0_pqg(dh, p, NULL, g);
+#endif +#endif
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L +#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
@ -48,7 +46,7 @@ Date: 21. Oct 2018
return dh; return dh;
failed: failed:
@@ -293,12 +317,24 @@ @@ -293,12 +315,24 @@
MP_gethex(q1, Q1024, res); MP_gethex(q1, Q1024, res);
assert(res); assert(res);
@ -73,7 +71,7 @@ Date: 21. Oct 2018
} }
MP_free(q1); MP_free(q1);
@@ -314,15 +350,29 @@ @@ -314,15 +348,29 @@
DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen) DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
{ {
int len; int len;
@ -103,7 +101,7 @@ Date: 21. Oct 2018
return 1; return 1;
} }
@@ -364,7 +414,13 @@ @@ -364,7 +412,13 @@
MP_gethex(q1, Q1024, len); MP_gethex(q1, Q1024, len);
assert(len); assert(len);
@ -161,7 +159,7 @@ Date: 21. Oct 2018
+#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0) +#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
+#else +#else
+#define HMAC_setup(ctx, key, len) HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0) +#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
+#endif +#endif
+#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, buf, len) +#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, buf, len)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L
@ -228,7 +226,7 @@ Date: 21. Oct 2018
+#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0) +#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0)
+#else +#else
+#define HMAC_setup(ctx, key, len) HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0) +#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
+#endif +#endif
+#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, (unsigned char *)buf, len) +#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_finish(ctx, dig, dlen) HMAC_Final(ctx, (unsigned char *)dig, &dlen);