diff options
author | joerg <joerg@pkgsrc.org> | 2020-03-27 02:08:46 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2020-03-27 02:08:46 +0000 |
commit | 4b29e63611a0d86fb0de67fb4ad893dfc4fc82d8 (patch) | |
tree | 9b8fe046c6a897d06108600f95a6a64dc3fb85bf /multimedia/gst-plugins0.10-bad | |
parent | bfb7f581a09e298bb4308ba9496aced312754695 (diff) | |
download | pkgsrc-4b29e63611a0d86fb0de67fb4ad893dfc4fc82d8.tar.gz |
Support newer OpensSL
Diffstat (limited to 'multimedia/gst-plugins0.10-bad')
-rw-r--r-- | multimedia/gst-plugins0.10-bad/distinfo | 3 | ||||
-rw-r--r-- | multimedia/gst-plugins0.10-bad/patches/patch-ext_apexsink_gstapexraop.c | 45 |
2 files changed, 47 insertions, 1 deletions
diff --git a/multimedia/gst-plugins0.10-bad/distinfo b/multimedia/gst-plugins0.10-bad/distinfo index 6b14af903f5..d09d57152f2 100644 --- a/multimedia/gst-plugins0.10-bad/distinfo +++ b/multimedia/gst-plugins0.10-bad/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.31 2015/12/25 20:07:42 joerg Exp $ +$NetBSD: distinfo,v 1.32 2020/03/27 02:08:46 joerg Exp $ SHA1 (gst-plugins-bad-0.10.23.tar.bz2) = 46208d7bcebaac31310e2a884cc840c51034781a RMD160 (gst-plugins-bad-0.10.23.tar.bz2) = 3a837843b8aa941ff7c81b90d37930ccb1ddb0be SHA512 (gst-plugins-bad-0.10.23.tar.bz2) = da73c4dcfcfd5afe8414920d83b6b2d4634daacfca70653e850e9a7ec519275b9b1b76f46aa8b87c0c5dcd8696d5b05b7c54a0f66698725e7f726b81eb367ddb Size (gst-plugins-bad-0.10.23.tar.bz2) = 4001543 bytes SHA1 (patch-ac) = f83a2eb523f0af4f3b63df425123394354b92c64 +SHA1 (patch-ext_apexsink_gstapexraop.c) = 51ab76fce6c63743954c8c9b27d3dbbc060b0578 SHA1 (patch-ext_spc_tag_c) = 6384b4ae56b4d1dca86ccc9106f147086784500f SHA1 (patch-ext_spc_tag_h) = 23186e9a06d08d3a3a482c924b7b3e3b7c55da7e SHA1 (patch-ext_vp8_gstvp8enc.c) = c4a1877d212a3a186e4fb5fe388c2185beeab3c5 diff --git a/multimedia/gst-plugins0.10-bad/patches/patch-ext_apexsink_gstapexraop.c b/multimedia/gst-plugins0.10-bad/patches/patch-ext_apexsink_gstapexraop.c new file mode 100644 index 00000000000..48c7b4df4b1 --- /dev/null +++ b/multimedia/gst-plugins0.10-bad/patches/patch-ext_apexsink_gstapexraop.c @@ -0,0 +1,45 @@ +$NetBSD: patch-ext_apexsink_gstapexraop.c,v 1.1 2020/03/27 02:08:46 joerg Exp $ + +--- ext/apexsink/gstapexraop.c.orig 2020-03-26 23:08:26.395993230 +0000 ++++ ext/apexsink/gstapexraop.c +@@ -292,12 +292,11 @@ gst_apexraop_connect (GstApExRAOP * con) + + rsa = RSA_new (); + mod = g_base64_decode (GST_APEX_RAOP_RSA_PUBLIC_MOD, &size); +- rsa->n = BN_bin2bn (mod, size, NULL); + exp = g_base64_decode (GST_APEX_RAOP_RSA_PUBLIC_EXP, &size); +- rsa->e = BN_bin2bn (exp, size, NULL); + size = + RSA_public_encrypt (AES_BLOCK_SIZE, conn->aes_ky, rsakey, rsa, + RSA_PKCS1_OAEP_PADDING); ++ RSA_set0_key(rsa, BN_bin2bn (mod, size, NULL), BN_bin2bn (exp, size, NULL), NULL); + + ky = g_base64_encode (rsakey, size); + iv = g_base64_encode (conn->aes_iv, AES_BLOCK_SIZE); +@@ -677,7 +676,7 @@ gst_apexraop_write (GstApExRAOP * con, g + guchar *buffer, *frame_data; + gushort len; + gint bit_offset, byte_offset, i, out_len, res; +- EVP_CIPHER_CTX aes_ctx; ++ EVP_CIPHER_CTX *aes_ctx; + _GstApExRAOP *conn = (_GstApExRAOP *) con; + const int frame_header_size = conn->generation == GST_APEX_GENERATION_ONE + ? GST_APEX_RAOP_FRAME_HEADER_SIZE : GST_APEX_RTP_FRAME_HEADER_SIZE; +@@ -737,13 +736,13 @@ gst_apexraop_write (GstApExRAOP * con, g + &bit_offset, &byte_offset); + } + +- EVP_CIPHER_CTX_init (&aes_ctx); +- EVP_CipherInit_ex (&aes_ctx, EVP_aes_128_cbc (), NULL, conn->aes_ky, ++ aes_ctx = EVP_CIPHER_CTX_new(); ++ EVP_CipherInit_ex (aes_ctx, EVP_aes_128_cbc (), NULL, conn->aes_ky, + conn->aes_iv, AES_ENCRYPT); +- EVP_CipherUpdate (&aes_ctx, frame_data, &out_len, frame_data, /*( */ ++ EVP_CipherUpdate (aes_ctx, frame_data, &out_len, frame_data, /*( */ + GST_APEX_RAOP_ALAC_HEADER_SIZE + + length /*) / AES_BLOCK_SIZE * AES_BLOCK_SIZE */ ); +- EVP_CIPHER_CTX_cleanup (&aes_ctx); ++ EVP_CIPHER_CTX_release (aes_ctx); + + res = + gst_apexraop_send (conn->data_sd, buffer, |