diff options
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/Manifest.gz | bin | 32474 -> 32473 bytes | |||
| -rw-r--r-- | net-libs/libsrtp/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex 005200130994..6983122066f5 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest index cf5aba1e31cb..026f19798773 100644 --- a/net-libs/libsrtp/Manifest +++ b/net-libs/libsrtp/Manifest @@ -1,4 +1,4 @@ -AUX libsrtp-1.6.0-openssl-1.1.patch 11603 BLAKE2B 1d5addff655f04bef9cebc79690a9731408795b8935099f529199bb7b30d9901633cefac543cc644c36c0e3de0a584f2e9fa4991a55a9cfa9bf4a349c60c9212 SHA512 c53c675ea8c6cc722c2c640bcf9ecdc4c386ccb7bf0ed29beadf4f2cc24830f8419b432f2b2f7ef78ebc003e57facddf2c930f134f045c38d481b8ee213caf38 +AUX libsrtp-1.6.0-openssl-1.1.patch 11366 BLAKE2B ab8d7dfc2c5de1a3b49eea5ed76c9bd78239cc4bd898c081c099fe14b73672d24004280274f6455449b925f34f66c08674615081319961b8e7523f9ee4134436 SHA512 d2883ba6798bae739c91ab6fa766a2cba2de5d614916f6dac7fcad421abac2c83fed945bc5585ae8c03663a673c1401b01dbf565001ac2c9923728939d99d3c3 AUX libsrtp-1.6.0-openssl-aem_gcm-key.patch 2704 BLAKE2B 686530bce1ba56f96fa6df4606e7133aa38df0f68e3636c7c599da54371383bc64dcb63baf7404b9744ec3bcf3f3548a4877edee1ab4be699f40ad37f10468af SHA512 f0b6156494c2c8f0c3dd78142203bc15ec52f3176e01dbed74cad5302b49dc3e146cd75a4fdaff30a83ea3b8498c1e147f0c820533f362af0a2b8599087ff837 AUX libsrtp-1.6.0-openssl-aem_icm-key.patch 3870 BLAKE2B 47dd3f9def13b48cc19657bcaf8a8c4ed77e2a4f738f72119f64825865c8820adb8ea2675695d8ce1b021dc61cdd6f478ec76fc97d9c9942178e63c1d578dc80 SHA512 561ce042f2216cdee8926f3931407116294aeed170297bf325fde02cda86a43d71aab538f2b54b2b7727a02629903c9aaf36cfe84dc6a2e4cda9388047519842 AUX libsrtp-1.6.0-openssl-hmac.patch 7673 BLAKE2B 92d4aa2699b324b81540f2e2fb360e1a4864b2626062c96265dade3581ad3af7119e0f6ebd8b1bdcd3591bcde29bffa2b516ed9ee0bdd4c578a5274805c1a7cd SHA512 c187d0249243e26d6cdae4a24b593651fb006b473d0a72b6c4c9b6ad2025893a37e33b163adbee728aa702223397b98fbc38ac2856b737dd03fd067b4dc4baf0 diff --git a/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch index 5d17cb426e88..9ca172688b5b 100644 --- a/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch +++ b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch @@ -217,7 +217,7 @@ Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f - if (pointer == NULL) { +/* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated + using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + { + /* allocate memory for auth and HMAC_CTX structures */ + uint8_t* pointer; @@ -263,7 +263,7 @@ Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f hmac_ctx = (HMAC_CTX*)a->state; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L HMAC_CTX_cleanup(hmac_ctx); /* zeroize entire state*/ @@ -318,7 +318,7 @@ Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f +/* OpenSSL 1.1.0 made EVP_MD_CTX an opaque structure, which must be allocated + using EVP_MD_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + +typedef EVP_MD_CTX sha1_ctx_t; + |