diff --git a/disable-pipewire.patch b/disable-pipewire.patch deleted file mode 100644 index cea6b682243b709611cbfce63312d4aa303eece3..0000000000000000000000000000000000000000 --- a/disable-pipewire.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff --git a/dom/media/webrtc/third_party_build/webrtc.mozbuild b/dom/media/webrtc/third_party_build/webrtc.mozbuild -index 30169c36c2..335e3cb1a1 100644 ---- a/dom/media/webrtc/third_party_build/webrtc.mozbuild -+++ b/dom/media/webrtc/third_party_build/webrtc.mozbuild -@@ -35,6 +35,3 @@ if CONFIG['MOZ_WEBRTC']: - - if CONFIG['MOZ_X11']: - DEFINES['WEBRTC_USE_X11'] = True -- -- if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": -- DEFINES['WEBRTC_USE_PIPEWIRE'] = True -diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -index 8c56b6b8e5..eaf8d7087a 100644 ---- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -+++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -@@ -232,102 +232,6 @@ if CONFIG["CPU_ARCH"] == "aarch64": - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- --if CONFIG["CPU_ARCH"] == "mips32": -- -- DEFINES["MIPS32_LE"] = True -- DEFINES["MIPS_FPU_LE"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- --if CONFIG["CPU_ARCH"] == "mips64": -- -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- - if CONFIG["CPU_ARCH"] == "ppc64": - - DEFINES["USE_X11"] = "1" -@@ -410,97 +314,6 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- - if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_X11"] = "1" -diff --git a/third_party/libwebrtc/modules/portal/portal_gn/moz.build b/third_party/libwebrtc/modules/portal/portal_gn/moz.build -index 77603c780b..e6f2c9e724 100644 ---- a/third_party/libwebrtc/modules/portal/portal_gn/moz.build -+++ b/third_party/libwebrtc/modules/portal/portal_gn/moz.build -@@ -26,7 +26,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True - DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" - DEFINES["WEBRTC_POSIX"] = True - DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["WEBRTC_USE_PIPEWIRE"] = True -+DEFINES["WEBRTC_USE_PIPEWIRE"] = False - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True -diff --git a/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build b/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build -index 86a0daf8fa..e895f2eb15 100644 ---- a/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build -+++ b/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build -@@ -24,7 +24,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True - DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" - DEFINES["WEBRTC_POSIX"] = True - DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["WEBRTC_USE_PIPEWIRE"] = True -+DEFINES["WEBRTC_USE_PIPEWIRE"] = False - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True diff --git a/firefox-115.12.0esr.source.tar.xz.asc b/firefox-115.12.0esr.source.tar.xz.asc deleted file mode 100644 index 42d37d9cc62374c6a2fc7bdad1fdcbc1f9ca5e1d..0000000000000000000000000000000000000000 --- a/firefox-115.12.0esr.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmZd9scACgkQ4207E/PZ -MnSujA/8CPJt/HWe7h11g7s3QmhbP8KR2k7XrEwZZCRvEBmD21a46JsAs/hg1Dci -QRjtJuh5dFyKiW+H+52w5A5nPFJqE0kInvdro4ag2mwOjIYHsWw9PiGcYQ/gxmvQ -OZqx+GqgsuAZzsg3z9IRt7faFydpwr/BIfjWnJCENU2s6/HGlUzM9oT1CLKG9aDZ -iXxdgJ76EZTOdAUr3ZT8sDNwmFdGYxdMuKOt2MoOiZ2JZOUfHm0+mNyXQQ9z8WK7 -w0fxsntaqwF5F2ISA2G5sjG8R0cLwWM4t5xcD71UrMF8OK60HzyiA0K73mNbAoUK -/9YJvcHOFjbVCRMkbTr05HJjricqfVWYPrzIfpMK6olmWmtu5DDtkacZkg78HPca -4Y+k7Z8NqDDQy3EJ3p4gV116hxhAQpQNddNda1i/QO3I4gRPeNug1cbQvtvGi3Jo -Yijw2VOODOxR525ZCvnSyM9ovT4pZjbqx8mSuMNFft5MgMdXCeW4+Kr57iOUWDXw -sR3dOhJwUoVvsQCtlrEXUm90f/KHr/ggd1zHXaQkb9BqRR2BLLiKK6cJTpzZxvcN -MOSNRJT4R1RkkRXCwHgwFo5MgbsEKGTQdIllneGT2J0qLqbutYfSfiDuJIzt0u73 -g8T11OyayQhc8YRbG/lKbcwXjeemPIxvnS0T5yIjNSNyD0ntIHs= -=5hQj ------END PGP SIGNATURE----- diff --git a/firefox-115.13.0esr.source.tar.xz.asc b/firefox-115.13.0esr.source.tar.xz.asc deleted file mode 100644 index 49178a4ba3b04057b1c6d96da1064af1e977e6a8..0000000000000000000000000000000000000000 --- a/firefox-115.13.0esr.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmaF+98ACgkQ4207E/PZ -MnRX3w/9GO5IkWE3cMK2ri0xdqYQhA0tN9/Vqi+axg7qR3bZ1tzgh7Hk+kEVhWqm -Zda3+8TGkGPSFn0TlgG+PaejnPtxfIDAjzuzdTntQ3o6i/cQzb+Uw9SfAI2UzEVG -Q9uQUsBU0d0JgUabUBkx3Bm0MBDLSy8kveRnX9nsNLkoIkEvFgsUn2aYh7CXIUXE -WVzSjWfEKv2+Km0iMqn5pMbbf1WgiMHMRCmttv2X0Y7sGc8whsSvhkSInNBLIp7+ -2KYbgy5zIcc7H4fFubRLoDUbeB/7vb/lACSQWk3MYO1OzOAaJmnNGVApCDBn3mXR -HS996EbUSQL+D5S9wEdTKX0WLNyw3rlQ7/y9ZGhVH2i6sZjtHBZBwTm4+R1jJzdV -xchiAR7x233dm/iB4HQzJ4zd0WVplFNF00nlKCAStOgF7r2TCOKSOiuCI0texMqJ -Kgt4bmG3bxyCwE/lgUUOoT8oXym1xog+569F7k7aA+I3Fxc0ZoJR5josVQde42YB -5HWDlTbw1RWl3OWf3sYvmnulq67td2RSZDrbBHGk/tPQpDN/mXzaoBAwqedRQ/1E -UKv+H8aUKbmXCLgRUjzQlvJWJt4c94adXcqWQIm87ZEduxCTeh+ZieQmCjn+39tD -FHUUSYNITHIAI3Q+g1ApBHbtmZa3ESIID2Jgq7/uuMd9LjRqBFw= -=aTpP ------END PGP SIGNATURE----- diff --git a/firefox-115.13.0esr.source.tar.xz b/firefox-115.14.0esr.source.tar.xz similarity index 100% rename from firefox-115.13.0esr.source.tar.xz rename to firefox-115.14.0esr.source.tar.xz diff --git a/firefox-115.14.0esr.source.tar.xz.asc b/firefox-115.14.0esr.source.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..e47895698ba79251a4fead2ef69ab85f015e5e12 --- /dev/null +++ b/firefox-115.14.0esr.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmar1MUACgkQ4207E/PZ +MnQ6shAAgi056+QhjSMAHmMxfKH7NSC3lsh/tQ2YRIxLJW/EoiSEExj9tCAltxd5 +vgmhwR1zRqTODsVr1ceLMczeOrSXbA45UaaIpbnCZ3P4vbaqVwpdCxbbEMKjkD6j +/tnmROaAc6Ywp1SnozaudTOt9nAZffwNjf+VbLCwe0AKHVaPw2sVjVppmmKX+Agt +m3Eoikj1cWDHxSv0zLz3NIiqp9ZyIW8sW9ZKyhz4iP9So+wjXJ0OJ1Fsc8FjQW2W +suQmIeFqhsZUFJtGAOkQf6QQMzfXqg3RPEHn5nv1Z1mThtf2FTLDM7XHs4QVhVgW +D6lVJfwPY+n59PgmZrkybEHAcntItBvb36t0ZTgGIOmbWVzSIHa7o+PWRb0nn0Jp +nUhAXNLYBjeOqAexyHNgNFsSPOcT720ZOumYRxJhf+KFIDoaWjtJJOKXf5gtBMPN +gSX1jcouvhUd7hAx/9cvu1VgsBdNZ9U7wcrjcRuTp95krMh0CtkME98JGWuIs8Zw +2z8IojkOJ5a4B7C6mvfoNOaKqN4BkU+XF9yE8tFX+3et3Ja1pW4TxGvlqQp8/O3F +9Y6xVJDsntiVgAAZcKn2eojFtui3xvZd/ThPWRTqwObjBdjnGKO+mB51UOMFnbc9 +DrI2Ax7BrOM0hfeA7hWxOLMmwsa//yW8KjrUS72RwxD8fYz8HFU= +=uyyK +-----END PGP SIGNATURE----- diff --git a/firefox-langpacks-115.13.0esr.tar.xz b/firefox-langpacks-115.14.0esr.tar.xz similarity index 79% rename from firefox-langpacks-115.13.0esr.tar.xz rename to firefox-langpacks-115.14.0esr.tar.xz index e9cb321ffb270d5c1bb7ed3208efab1dc68b0909..74759620c0eb6d3b180a1563c375db25f1d8f33d 100644 Binary files a/firefox-langpacks-115.13.0esr.tar.xz and b/firefox-langpacks-115.14.0esr.tar.xz differ diff --git a/firefox.spec b/firefox.spec index 294ab00811536b2917eba7cd09e4775869bd0ae3..8af351a48a7d68a2ba0b71cc29338e16698de34e 100644 --- a/firefox.spec +++ b/firefox.spec @@ -44,8 +44,8 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 115.13.0 -Release: 2 +Version: 115.14.0 +Release: 1 URL: https://www.mozilla.org/firefox/ License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.0-or-later Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz @@ -970,6 +970,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Aug 08 2024 wangkai <13474090681@163.com> - 115.14.0-1 +- Update to 115.14.0 +- Fix CVE-2024-7519 CVE-2024-7521 CVE-2024-7522 CVE-2024-7524 + CVE-2024-7525 CVE-2024-7526 CVE-2024-7527 CVE-2024-7529 CVE-2024-7531 + * Sat Aug 03 2024 lvfei - 102.15.0-2 - Fix bad date in changelog diff --git a/rhbz-2131158-webrtc-nss-fix.patch b/rhbz-2131158-webrtc-nss-fix.patch deleted file mode 100644 index 78b458d051e320d8ebe88e78ce752ac24b0f4708..0000000000000000000000000000000000000000 --- a/rhbz-2131158-webrtc-nss-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up firefox-102.3.0/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c.webrtc-fix firefox-102.3.0/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c ---- firefox-102.3.0/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c.webrtc-fix 2022-10-04 18:58:30.563683229 +0200 -+++ firefox-102.3.0/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c 2022-10-04 18:58:44.583652963 +0200 -@@ -293,7 +293,7 @@ static srtp_err_status_t srtp_aes_gcm_ns - - int rv; - SECItem param = { siBuffer, (unsigned char *)&c->params, -- sizeof(CK_GCM_PARAMS) }; -+ sizeof(CK_NSS_GCM_PARAMS) }; - if (encrypt) { - rv = PK11_Encrypt(c->key, CKM_AES_GCM, ¶m, buf, enc_len, - *enc_len + 16, buf, *enc_len); -diff -up firefox-102.3.0/third_party/libsrtp/src/crypto/include/aes_gcm.h.webrtc-fix firefox-102.3.0/third_party/libsrtp/src/crypto/include/aes_gcm.h ---- firefox-102.3.0/third_party/libsrtp/src/crypto/include/aes_gcm.h.webrtc-fix 2022-10-04 18:59:16.635583764 +0200 -+++ firefox-102.3.0/third_party/libsrtp/src/crypto/include/aes_gcm.h 2022-10-04 18:59:31.848550924 +0200 -@@ -101,7 +101,7 @@ typedef struct { - uint8_t iv[12]; - uint8_t aad[MAX_AD_SIZE]; - int aad_size; -- CK_GCM_PARAMS params; -+ CK_NSS_GCM_PARAMS params; - uint8_t tag[16]; - } srtp_aes_gcm_ctx_t; - -diff -up firefox-102.3.0/third_party/prio/prio/encrypt.c.webrtc-fix firefox-102.3.0/third_party/prio/prio/encrypt.c