From 5fd75514a36fc39bcf4a7eaecc5e616e2f514470 Mon Sep 17 00:00:00 2001
From: "Nils Ohlmeier [:drno]" <drno@ohlmeier.org>
Date: Tue, 9 Feb 2021 01:48:39 +0000
Subject: [PATCH] Bug 1691306: move libsrtp from /netwerk to /third_party.
 r=bwc,necko-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D104335
---
 dom/media/webrtc/jsapi/moz.build                          | 2 +-
 dom/media/webrtc/transport/common.build                   | 4 ++--
 dom/media/webrtc/transport/moz.build                      | 1 +
 dom/media/webrtc/transport/srtp/README_MOZILLA            | 7 +++++++
 dom/media/webrtc/transport/srtp/moz.build                 | 8 ++++++++
 dom/media/webrtc/transportbridge/moz.build                | 4 ++--
 media/webrtc/signaling/gtest/moz.build                    | 2 +-
 netwerk/moz.build                                         | 3 ---
 {netwerk/srtp => third_party/libsrtp}/src/LICENSE         | 0
 {netwerk/srtp => third_party/libsrtp}/src/README.md       | 0
 {netwerk/srtp => third_party/libsrtp}/src/VERSION         | 0
 .../srtp => third_party/libsrtp}/src/crypto/Makefile.in   | 0
 .../srtp => third_party/libsrtp}/src/crypto/cipher/aes.c  | 0
 .../libsrtp}/src/crypto/cipher/aes_gcm_nss.c              | 0
 .../libsrtp}/src/crypto/cipher/aes_gcm_ossl.c             | 0
 .../libsrtp}/src/crypto/cipher/aes_icm.c                  | 0
 .../libsrtp}/src/crypto/cipher/aes_icm_nss.c              | 0
 .../libsrtp}/src/crypto/cipher/aes_icm_ossl.c             | 0
 .../libsrtp}/src/crypto/cipher/cipher.c                   | 0
 .../libsrtp}/src/crypto/cipher/null_cipher.c              | 0
 .../srtp => third_party/libsrtp}/src/crypto/hash/auth.c   | 0
 .../srtp => third_party/libsrtp}/src/crypto/hash/hmac.c   | 0
 .../libsrtp}/src/crypto/hash/hmac_ossl.c                  | 0
 .../libsrtp}/src/crypto/hash/null_auth.c                  | 0
 .../srtp => third_party/libsrtp}/src/crypto/hash/sha1.c   | 0
 .../srtp => third_party/libsrtp}/src/crypto/include/aes.h | 0
 .../libsrtp}/src/crypto/include/aes_gcm.h                 | 0
 .../libsrtp}/src/crypto/include/aes_icm.h                 | 0
 .../libsrtp}/src/crypto/include/aes_icm_ext.h             | 0
 .../libsrtp}/src/crypto/include/alloc.h                   | 0
 .../libsrtp}/src/crypto/include/auth.h                    | 0
 .../libsrtp}/src/crypto/include/cipher.h                  | 0
 .../libsrtp}/src/crypto/include/cipher_types.h            | 0
 .../libsrtp}/src/crypto/include/crypto_kernel.h           | 0
 .../libsrtp}/src/crypto/include/crypto_types.h            | 0
 .../libsrtp}/src/crypto/include/datatypes.h               | 0
 .../srtp => third_party/libsrtp}/src/crypto/include/err.h | 0
 .../libsrtp}/src/crypto/include/hmac.h                    | 0
 .../libsrtp}/src/crypto/include/integers.h                | 0
 .../srtp => third_party/libsrtp}/src/crypto/include/key.h | 0
 .../libsrtp}/src/crypto/include/null_auth.h               | 0
 .../libsrtp}/src/crypto/include/null_cipher.h             | 0
 .../srtp => third_party/libsrtp}/src/crypto/include/rdb.h | 0
 .../libsrtp}/src/crypto/include/rdbx.h                    | 0
 .../libsrtp}/src/crypto/include/sha1.h                    | 0
 .../libsrtp}/src/crypto/include/stat.h                    | 0
 .../libsrtp}/src/crypto/kernel/alloc.c                    | 0
 .../libsrtp}/src/crypto/kernel/crypto_kernel.c            | 0
 .../srtp => third_party/libsrtp}/src/crypto/kernel/err.c  | 0
 .../srtp => third_party/libsrtp}/src/crypto/kernel/key.c  | 0
 .../libsrtp}/src/crypto/math/datatypes.c                  | 0
 .../srtp => third_party/libsrtp}/src/crypto/math/stat.c   | 0
 .../srtp => third_party/libsrtp}/src/crypto/replay/rdb.c  | 0
 .../srtp => third_party/libsrtp}/src/crypto/replay/rdbx.c | 0
 .../libsrtp}/src/crypto/replay/ut_sim.c                   | 0
 .../libsrtp}/src/crypto/test/aes_calc.c                   | 0
 .../libsrtp}/src/crypto/test/cipher_driver.c              | 0
 .../libsrtp}/src/crypto/test/datatypes_driver.c           | 0
 .../srtp => third_party/libsrtp}/src/crypto/test/env.c    | 0
 .../libsrtp}/src/crypto/test/kernel_driver.c              | 0
 .../libsrtp}/src/crypto/test/sha1_driver.c                | 0
 .../libsrtp}/src/crypto/test/stat_driver.c                | 0
 .../srtp => third_party/libsrtp}/src/include/config.h     | 0
 {netwerk/srtp => third_party/libsrtp}/src/include/ekt.h   | 0
 .../srtp => third_party/libsrtp}/src/include/getopt_s.h   | 0
 {netwerk/srtp => third_party/libsrtp}/src/include/srtp.h  | 0
 .../srtp => third_party/libsrtp}/src/include/srtp_priv.h  | 0
 .../srtp => third_party/libsrtp}/src/include/ut_sim.h     | 0
 {netwerk/srtp => third_party/libsrtp}/src/moz.build       | 0
 {netwerk/srtp => third_party/libsrtp}/src/srtp/ekt.c      | 0
 {netwerk/srtp => third_party/libsrtp}/src/srtp/srtp.c     | 0
 {netwerk/srtp => third_party/libsrtp}/src/test/cutest.h   | 0
 .../libsrtp}/src/test/dtls_srtp_driver.c                  | 0
 {netwerk/srtp => third_party/libsrtp}/src/test/getopt_s.c | 0
 .../srtp => third_party/libsrtp}/src/test/rdbx_driver.c   | 0
 .../srtp => third_party/libsrtp}/src/test/replay_driver.c | 0
 .../srtp => third_party/libsrtp}/src/test/roc_driver.c    | 0
 {netwerk/srtp => third_party/libsrtp}/src/test/rtp.c      | 0
 {netwerk/srtp => third_party/libsrtp}/src/test/rtp.h      | 0
 .../srtp => third_party/libsrtp}/src/test/rtp_decoder.c   | 0
 .../srtp => third_party/libsrtp}/src/test/rtp_decoder.h   | 0
 {netwerk/srtp => third_party/libsrtp}/src/test/rtpw.c     | 0
 .../srtp => third_party/libsrtp}/src/test/rtpw_test.sh    | 0
 .../libsrtp}/src/test/rtpw_test_gcm.sh                    | 0
 .../srtp => third_party/libsrtp}/src/test/srtp_driver.c   | 0
 .../srtp => third_party/libsrtp}/src/test/test_srtp.c     | 0
 {netwerk/srtp => third_party/libsrtp}/src/test/util.c     | 0
 {netwerk/srtp => third_party/libsrtp}/src/test/util.h     | 0
 {netwerk/srtp => third_party/libsrtp}/src/test/words.txt  | 0
 {netwerk/srtp => third_party/libsrtp}/srtp_update.log     | 0
 {netwerk/srtp => third_party/libsrtp}/update_srtp.sh      | 0
 third_party/moz.build                                     | 4 ++++
 92 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 dom/media/webrtc/transport/srtp/README_MOZILLA
 create mode 100644 dom/media/webrtc/transport/srtp/moz.build
 rename {netwerk/srtp => third_party/libsrtp}/src/LICENSE (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/README.md (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/VERSION (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/Makefile.in (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/cipher/aes.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/cipher/aes_gcm_nss.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/cipher/aes_gcm_ossl.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/cipher/aes_icm.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/cipher/aes_icm_nss.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/cipher/aes_icm_ossl.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/cipher/cipher.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/cipher/null_cipher.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/hash/auth.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/hash/hmac.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/hash/hmac_ossl.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/hash/null_auth.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/hash/sha1.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/aes.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/aes_gcm.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/aes_icm.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/aes_icm_ext.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/alloc.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/auth.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/cipher.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/cipher_types.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/crypto_kernel.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/crypto_types.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/datatypes.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/err.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/hmac.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/integers.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/key.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/null_auth.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/null_cipher.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/rdb.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/rdbx.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/sha1.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/include/stat.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/kernel/alloc.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/kernel/crypto_kernel.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/kernel/err.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/kernel/key.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/math/datatypes.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/math/stat.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/replay/rdb.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/replay/rdbx.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/replay/ut_sim.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/test/aes_calc.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/test/cipher_driver.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/test/datatypes_driver.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/test/env.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/test/kernel_driver.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/test/sha1_driver.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/crypto/test/stat_driver.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/include/config.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/include/ekt.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/include/getopt_s.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/include/srtp.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/include/srtp_priv.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/include/ut_sim.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/moz.build (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/srtp/ekt.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/srtp/srtp.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/cutest.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/dtls_srtp_driver.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/getopt_s.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/rdbx_driver.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/replay_driver.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/roc_driver.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/rtp.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/rtp.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/rtp_decoder.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/rtp_decoder.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/rtpw.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/rtpw_test.sh (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/rtpw_test_gcm.sh (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/srtp_driver.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/test_srtp.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/util.c (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/util.h (100%)
 rename {netwerk/srtp => third_party/libsrtp}/src/test/words.txt (100%)
 rename {netwerk/srtp => third_party/libsrtp}/srtp_update.log (100%)
 rename {netwerk/srtp => third_party/libsrtp}/update_srtp.sh (100%)

diff --git a/dom/media/webrtc/jsapi/moz.build b/dom/media/webrtc/jsapi/moz.build
index 978df17d291b..efa3e2b515b4 100644
--- a/dom/media/webrtc/jsapi/moz.build
+++ b/dom/media/webrtc/jsapi/moz.build
@@ -12,7 +12,7 @@ LOCAL_INCLUDES += [
     "/dom/media/webrtc",
     "/ipc/chromium/src",
     "/media/webrtc",
-    "/netwerk/srtp/src/include",
+    "/third_party/libsrtp/src/include",
     "/third_party/libwebrtc",
     "/third_party/libwebrtc/webrtc",
 ]
diff --git a/dom/media/webrtc/transport/common.build b/dom/media/webrtc/transport/common.build
index fecf14913598..3bc9e21d605a 100644
--- a/dom/media/webrtc/transport/common.build
+++ b/dom/media/webrtc/transport/common.build
@@ -52,8 +52,8 @@ LOCAL_INCLUDES += [
     "/dom/media/webrtc/transport/third_party/nrappkit/src/share",
     "/dom/media/webrtc/transport/third_party/nrappkit/src/stats",
     "/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr",
-    "/netwerk/srtp/src/crypto/include",
-    "/netwerk/srtp/src/include",
+    "/third_party/libsrtp/src/crypto/include",
+    "/third_party/libsrtp/src/include",
 ]
 
 if CONFIG["OS_TARGET"] in ["Darwin", "DragonFly", "FreeBSD", "NetBSD", "OpenBSD"]:
diff --git a/dom/media/webrtc/transport/moz.build b/dom/media/webrtc/transport/moz.build
index 4fefe2c062d7..fcf265e22f60 100644
--- a/dom/media/webrtc/transport/moz.build
+++ b/dom/media/webrtc/transport/moz.build
@@ -13,6 +13,7 @@ DIRS += [
     "/dom/media/webrtc/transport/third_party",
     "/dom/media/webrtc/transport/build",
     "/dom/media/webrtc/transport/ipc",
+    "/dom/media/webrtc/transport/srtp",
 ]
 
 # Add libFuzzer configuration directives
diff --git a/dom/media/webrtc/transport/srtp/README_MOZILLA b/dom/media/webrtc/transport/srtp/README_MOZILLA
new file mode 100644
index 000000000000..8533b67c53c1
--- /dev/null
+++ b/dom/media/webrtc/transport/srtp/README_MOZILLA
@@ -0,0 +1,7 @@
+This directory contains build files for libsrtp. The actual library
+source is in $TOPSRCDIR/third_party/libsrtp/
+
+The upstream git repository is https://github.com/cisco/libsrtp
+
+TBD add code and instructions how to do a clean update import without manual
+intervention.
diff --git a/dom/media/webrtc/transport/srtp/moz.build b/dom/media/webrtc/transport/srtp/moz.build
new file mode 100644
index 000000000000..d3d4971a6dab
--- /dev/null
+++ b/dom/media/webrtc/transport/srtp/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if CONFIG["MOZ_SRTP"]:
+    DIRS += ["/third_party/libsrtp/src"]
diff --git a/dom/media/webrtc/transportbridge/moz.build b/dom/media/webrtc/transportbridge/moz.build
index 65ce9100a3f3..8f251798df82 100644
--- a/dom/media/webrtc/transportbridge/moz.build
+++ b/dom/media/webrtc/transportbridge/moz.build
@@ -12,8 +12,8 @@ LOCAL_INCLUDES += [
     "/ipc/chromium/src",
     "/media/libyuv/libyuv/include",
     "/media/webrtc",
-    "/netwerk/srtp/src/crypto/include",
-    "/netwerk/srtp/src/include",
+    "/third_party/libsrtp/src/crypto/include",
+    "/third_party/libsrtp/src/include",
     "/third_party/libwebrtc",
     "/third_party/libwebrtc/webrtc",
 ]
diff --git a/media/webrtc/signaling/gtest/moz.build b/media/webrtc/signaling/gtest/moz.build
index 5ec958e4ded4..df996c24c269 100644
--- a/media/webrtc/signaling/gtest/moz.build
+++ b/media/webrtc/signaling/gtest/moz.build
@@ -32,7 +32,7 @@ if (
         "/dom/media/webrtc/transportbridge",
         "/ipc/chromium/src",
         "/media/webrtc/",
-        "/netwerk/srtp/src/include",
+        "/third_party/libsrtp/src/include",
         "/third_party/libwebrtc",
         "/third_party/libwebrtc/webrtc",
         "/third_party/sipcc",
diff --git a/netwerk/moz.build b/netwerk/moz.build
index c3414cba532e..d5f4c956ec3c 100644
--- a/netwerk/moz.build
+++ b/netwerk/moz.build
@@ -22,9 +22,6 @@ DIRS += [
     "url-classifier",
 ]
 
-if CONFIG["MOZ_SRTP"]:
-    DIRS += ["srtp/src"]
-
 if CONFIG["MOZ_SCTP"]:
     DIRS += ["sctp/src", "sctp/datachannel"]
 
diff --git a/netwerk/srtp/src/LICENSE b/third_party/libsrtp/src/LICENSE
similarity index 100%
rename from netwerk/srtp/src/LICENSE
rename to third_party/libsrtp/src/LICENSE
diff --git a/netwerk/srtp/src/README.md b/third_party/libsrtp/src/README.md
similarity index 100%
rename from netwerk/srtp/src/README.md
rename to third_party/libsrtp/src/README.md
diff --git a/netwerk/srtp/src/VERSION b/third_party/libsrtp/src/VERSION
similarity index 100%
rename from netwerk/srtp/src/VERSION
rename to third_party/libsrtp/src/VERSION
diff --git a/netwerk/srtp/src/crypto/Makefile.in b/third_party/libsrtp/src/crypto/Makefile.in
similarity index 100%
rename from netwerk/srtp/src/crypto/Makefile.in
rename to third_party/libsrtp/src/crypto/Makefile.in
diff --git a/netwerk/srtp/src/crypto/cipher/aes.c b/third_party/libsrtp/src/crypto/cipher/aes.c
similarity index 100%
rename from netwerk/srtp/src/crypto/cipher/aes.c
rename to third_party/libsrtp/src/crypto/cipher/aes.c
diff --git a/netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c b/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c
similarity index 100%
rename from netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c
rename to third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c
diff --git a/netwerk/srtp/src/crypto/cipher/aes_gcm_ossl.c b/third_party/libsrtp/src/crypto/cipher/aes_gcm_ossl.c
similarity index 100%
rename from netwerk/srtp/src/crypto/cipher/aes_gcm_ossl.c
rename to third_party/libsrtp/src/crypto/cipher/aes_gcm_ossl.c
diff --git a/netwerk/srtp/src/crypto/cipher/aes_icm.c b/third_party/libsrtp/src/crypto/cipher/aes_icm.c
similarity index 100%
rename from netwerk/srtp/src/crypto/cipher/aes_icm.c
rename to third_party/libsrtp/src/crypto/cipher/aes_icm.c
diff --git a/netwerk/srtp/src/crypto/cipher/aes_icm_nss.c b/third_party/libsrtp/src/crypto/cipher/aes_icm_nss.c
similarity index 100%
rename from netwerk/srtp/src/crypto/cipher/aes_icm_nss.c
rename to third_party/libsrtp/src/crypto/cipher/aes_icm_nss.c
diff --git a/netwerk/srtp/src/crypto/cipher/aes_icm_ossl.c b/third_party/libsrtp/src/crypto/cipher/aes_icm_ossl.c
similarity index 100%
rename from netwerk/srtp/src/crypto/cipher/aes_icm_ossl.c
rename to third_party/libsrtp/src/crypto/cipher/aes_icm_ossl.c
diff --git a/netwerk/srtp/src/crypto/cipher/cipher.c b/third_party/libsrtp/src/crypto/cipher/cipher.c
similarity index 100%
rename from netwerk/srtp/src/crypto/cipher/cipher.c
rename to third_party/libsrtp/src/crypto/cipher/cipher.c
diff --git a/netwerk/srtp/src/crypto/cipher/null_cipher.c b/third_party/libsrtp/src/crypto/cipher/null_cipher.c
similarity index 100%
rename from netwerk/srtp/src/crypto/cipher/null_cipher.c
rename to third_party/libsrtp/src/crypto/cipher/null_cipher.c
diff --git a/netwerk/srtp/src/crypto/hash/auth.c b/third_party/libsrtp/src/crypto/hash/auth.c
similarity index 100%
rename from netwerk/srtp/src/crypto/hash/auth.c
rename to third_party/libsrtp/src/crypto/hash/auth.c
diff --git a/netwerk/srtp/src/crypto/hash/hmac.c b/third_party/libsrtp/src/crypto/hash/hmac.c
similarity index 100%
rename from netwerk/srtp/src/crypto/hash/hmac.c
rename to third_party/libsrtp/src/crypto/hash/hmac.c
diff --git a/netwerk/srtp/src/crypto/hash/hmac_ossl.c b/third_party/libsrtp/src/crypto/hash/hmac_ossl.c
similarity index 100%
rename from netwerk/srtp/src/crypto/hash/hmac_ossl.c
rename to third_party/libsrtp/src/crypto/hash/hmac_ossl.c
diff --git a/netwerk/srtp/src/crypto/hash/null_auth.c b/third_party/libsrtp/src/crypto/hash/null_auth.c
similarity index 100%
rename from netwerk/srtp/src/crypto/hash/null_auth.c
rename to third_party/libsrtp/src/crypto/hash/null_auth.c
diff --git a/netwerk/srtp/src/crypto/hash/sha1.c b/third_party/libsrtp/src/crypto/hash/sha1.c
similarity index 100%
rename from netwerk/srtp/src/crypto/hash/sha1.c
rename to third_party/libsrtp/src/crypto/hash/sha1.c
diff --git a/netwerk/srtp/src/crypto/include/aes.h b/third_party/libsrtp/src/crypto/include/aes.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/aes.h
rename to third_party/libsrtp/src/crypto/include/aes.h
diff --git a/netwerk/srtp/src/crypto/include/aes_gcm.h b/third_party/libsrtp/src/crypto/include/aes_gcm.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/aes_gcm.h
rename to third_party/libsrtp/src/crypto/include/aes_gcm.h
diff --git a/netwerk/srtp/src/crypto/include/aes_icm.h b/third_party/libsrtp/src/crypto/include/aes_icm.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/aes_icm.h
rename to third_party/libsrtp/src/crypto/include/aes_icm.h
diff --git a/netwerk/srtp/src/crypto/include/aes_icm_ext.h b/third_party/libsrtp/src/crypto/include/aes_icm_ext.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/aes_icm_ext.h
rename to third_party/libsrtp/src/crypto/include/aes_icm_ext.h
diff --git a/netwerk/srtp/src/crypto/include/alloc.h b/third_party/libsrtp/src/crypto/include/alloc.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/alloc.h
rename to third_party/libsrtp/src/crypto/include/alloc.h
diff --git a/netwerk/srtp/src/crypto/include/auth.h b/third_party/libsrtp/src/crypto/include/auth.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/auth.h
rename to third_party/libsrtp/src/crypto/include/auth.h
diff --git a/netwerk/srtp/src/crypto/include/cipher.h b/third_party/libsrtp/src/crypto/include/cipher.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/cipher.h
rename to third_party/libsrtp/src/crypto/include/cipher.h
diff --git a/netwerk/srtp/src/crypto/include/cipher_types.h b/third_party/libsrtp/src/crypto/include/cipher_types.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/cipher_types.h
rename to third_party/libsrtp/src/crypto/include/cipher_types.h
diff --git a/netwerk/srtp/src/crypto/include/crypto_kernel.h b/third_party/libsrtp/src/crypto/include/crypto_kernel.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/crypto_kernel.h
rename to third_party/libsrtp/src/crypto/include/crypto_kernel.h
diff --git a/netwerk/srtp/src/crypto/include/crypto_types.h b/third_party/libsrtp/src/crypto/include/crypto_types.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/crypto_types.h
rename to third_party/libsrtp/src/crypto/include/crypto_types.h
diff --git a/netwerk/srtp/src/crypto/include/datatypes.h b/third_party/libsrtp/src/crypto/include/datatypes.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/datatypes.h
rename to third_party/libsrtp/src/crypto/include/datatypes.h
diff --git a/netwerk/srtp/src/crypto/include/err.h b/third_party/libsrtp/src/crypto/include/err.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/err.h
rename to third_party/libsrtp/src/crypto/include/err.h
diff --git a/netwerk/srtp/src/crypto/include/hmac.h b/third_party/libsrtp/src/crypto/include/hmac.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/hmac.h
rename to third_party/libsrtp/src/crypto/include/hmac.h
diff --git a/netwerk/srtp/src/crypto/include/integers.h b/third_party/libsrtp/src/crypto/include/integers.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/integers.h
rename to third_party/libsrtp/src/crypto/include/integers.h
diff --git a/netwerk/srtp/src/crypto/include/key.h b/third_party/libsrtp/src/crypto/include/key.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/key.h
rename to third_party/libsrtp/src/crypto/include/key.h
diff --git a/netwerk/srtp/src/crypto/include/null_auth.h b/third_party/libsrtp/src/crypto/include/null_auth.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/null_auth.h
rename to third_party/libsrtp/src/crypto/include/null_auth.h
diff --git a/netwerk/srtp/src/crypto/include/null_cipher.h b/third_party/libsrtp/src/crypto/include/null_cipher.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/null_cipher.h
rename to third_party/libsrtp/src/crypto/include/null_cipher.h
diff --git a/netwerk/srtp/src/crypto/include/rdb.h b/third_party/libsrtp/src/crypto/include/rdb.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/rdb.h
rename to third_party/libsrtp/src/crypto/include/rdb.h
diff --git a/netwerk/srtp/src/crypto/include/rdbx.h b/third_party/libsrtp/src/crypto/include/rdbx.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/rdbx.h
rename to third_party/libsrtp/src/crypto/include/rdbx.h
diff --git a/netwerk/srtp/src/crypto/include/sha1.h b/third_party/libsrtp/src/crypto/include/sha1.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/sha1.h
rename to third_party/libsrtp/src/crypto/include/sha1.h
diff --git a/netwerk/srtp/src/crypto/include/stat.h b/third_party/libsrtp/src/crypto/include/stat.h
similarity index 100%
rename from netwerk/srtp/src/crypto/include/stat.h
rename to third_party/libsrtp/src/crypto/include/stat.h
diff --git a/netwerk/srtp/src/crypto/kernel/alloc.c b/third_party/libsrtp/src/crypto/kernel/alloc.c
similarity index 100%
rename from netwerk/srtp/src/crypto/kernel/alloc.c
rename to third_party/libsrtp/src/crypto/kernel/alloc.c
diff --git a/netwerk/srtp/src/crypto/kernel/crypto_kernel.c b/third_party/libsrtp/src/crypto/kernel/crypto_kernel.c
similarity index 100%
rename from netwerk/srtp/src/crypto/kernel/crypto_kernel.c
rename to third_party/libsrtp/src/crypto/kernel/crypto_kernel.c
diff --git a/netwerk/srtp/src/crypto/kernel/err.c b/third_party/libsrtp/src/crypto/kernel/err.c
similarity index 100%
rename from netwerk/srtp/src/crypto/kernel/err.c
rename to third_party/libsrtp/src/crypto/kernel/err.c
diff --git a/netwerk/srtp/src/crypto/kernel/key.c b/third_party/libsrtp/src/crypto/kernel/key.c
similarity index 100%
rename from netwerk/srtp/src/crypto/kernel/key.c
rename to third_party/libsrtp/src/crypto/kernel/key.c
diff --git a/netwerk/srtp/src/crypto/math/datatypes.c b/third_party/libsrtp/src/crypto/math/datatypes.c
similarity index 100%
rename from netwerk/srtp/src/crypto/math/datatypes.c
rename to third_party/libsrtp/src/crypto/math/datatypes.c
diff --git a/netwerk/srtp/src/crypto/math/stat.c b/third_party/libsrtp/src/crypto/math/stat.c
similarity index 100%
rename from netwerk/srtp/src/crypto/math/stat.c
rename to third_party/libsrtp/src/crypto/math/stat.c
diff --git a/netwerk/srtp/src/crypto/replay/rdb.c b/third_party/libsrtp/src/crypto/replay/rdb.c
similarity index 100%
rename from netwerk/srtp/src/crypto/replay/rdb.c
rename to third_party/libsrtp/src/crypto/replay/rdb.c
diff --git a/netwerk/srtp/src/crypto/replay/rdbx.c b/third_party/libsrtp/src/crypto/replay/rdbx.c
similarity index 100%
rename from netwerk/srtp/src/crypto/replay/rdbx.c
rename to third_party/libsrtp/src/crypto/replay/rdbx.c
diff --git a/netwerk/srtp/src/crypto/replay/ut_sim.c b/third_party/libsrtp/src/crypto/replay/ut_sim.c
similarity index 100%
rename from netwerk/srtp/src/crypto/replay/ut_sim.c
rename to third_party/libsrtp/src/crypto/replay/ut_sim.c
diff --git a/netwerk/srtp/src/crypto/test/aes_calc.c b/third_party/libsrtp/src/crypto/test/aes_calc.c
similarity index 100%
rename from netwerk/srtp/src/crypto/test/aes_calc.c
rename to third_party/libsrtp/src/crypto/test/aes_calc.c
diff --git a/netwerk/srtp/src/crypto/test/cipher_driver.c b/third_party/libsrtp/src/crypto/test/cipher_driver.c
similarity index 100%
rename from netwerk/srtp/src/crypto/test/cipher_driver.c
rename to third_party/libsrtp/src/crypto/test/cipher_driver.c
diff --git a/netwerk/srtp/src/crypto/test/datatypes_driver.c b/third_party/libsrtp/src/crypto/test/datatypes_driver.c
similarity index 100%
rename from netwerk/srtp/src/crypto/test/datatypes_driver.c
rename to third_party/libsrtp/src/crypto/test/datatypes_driver.c
diff --git a/netwerk/srtp/src/crypto/test/env.c b/third_party/libsrtp/src/crypto/test/env.c
similarity index 100%
rename from netwerk/srtp/src/crypto/test/env.c
rename to third_party/libsrtp/src/crypto/test/env.c
diff --git a/netwerk/srtp/src/crypto/test/kernel_driver.c b/third_party/libsrtp/src/crypto/test/kernel_driver.c
similarity index 100%
rename from netwerk/srtp/src/crypto/test/kernel_driver.c
rename to third_party/libsrtp/src/crypto/test/kernel_driver.c
diff --git a/netwerk/srtp/src/crypto/test/sha1_driver.c b/third_party/libsrtp/src/crypto/test/sha1_driver.c
similarity index 100%
rename from netwerk/srtp/src/crypto/test/sha1_driver.c
rename to third_party/libsrtp/src/crypto/test/sha1_driver.c
diff --git a/netwerk/srtp/src/crypto/test/stat_driver.c b/third_party/libsrtp/src/crypto/test/stat_driver.c
similarity index 100%
rename from netwerk/srtp/src/crypto/test/stat_driver.c
rename to third_party/libsrtp/src/crypto/test/stat_driver.c
diff --git a/netwerk/srtp/src/include/config.h b/third_party/libsrtp/src/include/config.h
similarity index 100%
rename from netwerk/srtp/src/include/config.h
rename to third_party/libsrtp/src/include/config.h
diff --git a/netwerk/srtp/src/include/ekt.h b/third_party/libsrtp/src/include/ekt.h
similarity index 100%
rename from netwerk/srtp/src/include/ekt.h
rename to third_party/libsrtp/src/include/ekt.h
diff --git a/netwerk/srtp/src/include/getopt_s.h b/third_party/libsrtp/src/include/getopt_s.h
similarity index 100%
rename from netwerk/srtp/src/include/getopt_s.h
rename to third_party/libsrtp/src/include/getopt_s.h
diff --git a/netwerk/srtp/src/include/srtp.h b/third_party/libsrtp/src/include/srtp.h
similarity index 100%
rename from netwerk/srtp/src/include/srtp.h
rename to third_party/libsrtp/src/include/srtp.h
diff --git a/netwerk/srtp/src/include/srtp_priv.h b/third_party/libsrtp/src/include/srtp_priv.h
similarity index 100%
rename from netwerk/srtp/src/include/srtp_priv.h
rename to third_party/libsrtp/src/include/srtp_priv.h
diff --git a/netwerk/srtp/src/include/ut_sim.h b/third_party/libsrtp/src/include/ut_sim.h
similarity index 100%
rename from netwerk/srtp/src/include/ut_sim.h
rename to third_party/libsrtp/src/include/ut_sim.h
diff --git a/netwerk/srtp/src/moz.build b/third_party/libsrtp/src/moz.build
similarity index 100%
rename from netwerk/srtp/src/moz.build
rename to third_party/libsrtp/src/moz.build
diff --git a/netwerk/srtp/src/srtp/ekt.c b/third_party/libsrtp/src/srtp/ekt.c
similarity index 100%
rename from netwerk/srtp/src/srtp/ekt.c
rename to third_party/libsrtp/src/srtp/ekt.c
diff --git a/netwerk/srtp/src/srtp/srtp.c b/third_party/libsrtp/src/srtp/srtp.c
similarity index 100%
rename from netwerk/srtp/src/srtp/srtp.c
rename to third_party/libsrtp/src/srtp/srtp.c
diff --git a/netwerk/srtp/src/test/cutest.h b/third_party/libsrtp/src/test/cutest.h
similarity index 100%
rename from netwerk/srtp/src/test/cutest.h
rename to third_party/libsrtp/src/test/cutest.h
diff --git a/netwerk/srtp/src/test/dtls_srtp_driver.c b/third_party/libsrtp/src/test/dtls_srtp_driver.c
similarity index 100%
rename from netwerk/srtp/src/test/dtls_srtp_driver.c
rename to third_party/libsrtp/src/test/dtls_srtp_driver.c
diff --git a/netwerk/srtp/src/test/getopt_s.c b/third_party/libsrtp/src/test/getopt_s.c
similarity index 100%
rename from netwerk/srtp/src/test/getopt_s.c
rename to third_party/libsrtp/src/test/getopt_s.c
diff --git a/netwerk/srtp/src/test/rdbx_driver.c b/third_party/libsrtp/src/test/rdbx_driver.c
similarity index 100%
rename from netwerk/srtp/src/test/rdbx_driver.c
rename to third_party/libsrtp/src/test/rdbx_driver.c
diff --git a/netwerk/srtp/src/test/replay_driver.c b/third_party/libsrtp/src/test/replay_driver.c
similarity index 100%
rename from netwerk/srtp/src/test/replay_driver.c
rename to third_party/libsrtp/src/test/replay_driver.c
diff --git a/netwerk/srtp/src/test/roc_driver.c b/third_party/libsrtp/src/test/roc_driver.c
similarity index 100%
rename from netwerk/srtp/src/test/roc_driver.c
rename to third_party/libsrtp/src/test/roc_driver.c
diff --git a/netwerk/srtp/src/test/rtp.c b/third_party/libsrtp/src/test/rtp.c
similarity index 100%
rename from netwerk/srtp/src/test/rtp.c
rename to third_party/libsrtp/src/test/rtp.c
diff --git a/netwerk/srtp/src/test/rtp.h b/third_party/libsrtp/src/test/rtp.h
similarity index 100%
rename from netwerk/srtp/src/test/rtp.h
rename to third_party/libsrtp/src/test/rtp.h
diff --git a/netwerk/srtp/src/test/rtp_decoder.c b/third_party/libsrtp/src/test/rtp_decoder.c
similarity index 100%
rename from netwerk/srtp/src/test/rtp_decoder.c
rename to third_party/libsrtp/src/test/rtp_decoder.c
diff --git a/netwerk/srtp/src/test/rtp_decoder.h b/third_party/libsrtp/src/test/rtp_decoder.h
similarity index 100%
rename from netwerk/srtp/src/test/rtp_decoder.h
rename to third_party/libsrtp/src/test/rtp_decoder.h
diff --git a/netwerk/srtp/src/test/rtpw.c b/third_party/libsrtp/src/test/rtpw.c
similarity index 100%
rename from netwerk/srtp/src/test/rtpw.c
rename to third_party/libsrtp/src/test/rtpw.c
diff --git a/netwerk/srtp/src/test/rtpw_test.sh b/third_party/libsrtp/src/test/rtpw_test.sh
similarity index 100%
rename from netwerk/srtp/src/test/rtpw_test.sh
rename to third_party/libsrtp/src/test/rtpw_test.sh
diff --git a/netwerk/srtp/src/test/rtpw_test_gcm.sh b/third_party/libsrtp/src/test/rtpw_test_gcm.sh
similarity index 100%
rename from netwerk/srtp/src/test/rtpw_test_gcm.sh
rename to third_party/libsrtp/src/test/rtpw_test_gcm.sh
diff --git a/netwerk/srtp/src/test/srtp_driver.c b/third_party/libsrtp/src/test/srtp_driver.c
similarity index 100%
rename from netwerk/srtp/src/test/srtp_driver.c
rename to third_party/libsrtp/src/test/srtp_driver.c
diff --git a/netwerk/srtp/src/test/test_srtp.c b/third_party/libsrtp/src/test/test_srtp.c
similarity index 100%
rename from netwerk/srtp/src/test/test_srtp.c
rename to third_party/libsrtp/src/test/test_srtp.c
diff --git a/netwerk/srtp/src/test/util.c b/third_party/libsrtp/src/test/util.c
similarity index 100%
rename from netwerk/srtp/src/test/util.c
rename to third_party/libsrtp/src/test/util.c
diff --git a/netwerk/srtp/src/test/util.h b/third_party/libsrtp/src/test/util.h
similarity index 100%
rename from netwerk/srtp/src/test/util.h
rename to third_party/libsrtp/src/test/util.h
diff --git a/netwerk/srtp/src/test/words.txt b/third_party/libsrtp/src/test/words.txt
similarity index 100%
rename from netwerk/srtp/src/test/words.txt
rename to third_party/libsrtp/src/test/words.txt
diff --git a/netwerk/srtp/srtp_update.log b/third_party/libsrtp/srtp_update.log
similarity index 100%
rename from netwerk/srtp/srtp_update.log
rename to third_party/libsrtp/srtp_update.log
diff --git a/netwerk/srtp/update_srtp.sh b/third_party/libsrtp/update_srtp.sh
similarity index 100%
rename from netwerk/srtp/update_srtp.sh
rename to third_party/libsrtp/update_srtp.sh
diff --git a/third_party/moz.build b/third_party/moz.build
index b204d4ffd25c..9494efdeb8e8 100644
--- a/third_party/moz.build
+++ b/third_party/moz.build
@@ -45,3 +45,7 @@ with Files("pipewire/**"):
 
 with Files('WinToast/**'):
     BUG_COMPONENT = ('Toolkit', 'General')
+
+with Files('libsrtp/**'):
+    BUG_COMPONENT = ('Core', 'WeebRTC: Network')
+