Bug 1691306: move libsrtp from /netwerk to /third_party. r=bwc,necko-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D104335
2021-02-09 01:48:39 +00:00 · 2021-02-09 01:48:39 +00:00 · 5fd75514a3
--- 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",
 ]
--- 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"]:
--- 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
--- a/dom/media/webrtc/transport/srtp/README_MOZILLA
+++ 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.
--- a/dom/media/webrtc/transport/srtp/moz.build
+++ 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"]
--- 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",
 ]
--- 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",
--- 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"]

--- a/third_party/libsrtp/src/LICENSE
+++ b/third_party/libsrtp/src/LICENSE
--- a/third_party/libsrtp/src/README.md
+++ b/third_party/libsrtp/src/README.md
--- a/third_party/libsrtp/src/VERSION
+++ b/third_party/libsrtp/src/VERSION
--- a/third_party/libsrtp/src/crypto/Makefile.in
+++ b/third_party/libsrtp/src/crypto/Makefile.in
--- a/third_party/libsrtp/src/crypto/cipher/aes.c
+++ b/third_party/libsrtp/src/crypto/cipher/aes.c
--- a/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c
+++ b/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c
--- a/third_party/libsrtp/src/crypto/cipher/aes_gcm_ossl.c
+++ b/third_party/libsrtp/src/crypto/cipher/aes_gcm_ossl.c
--- a/third_party/libsrtp/src/crypto/cipher/aes_icm.c
+++ b/third_party/libsrtp/src/crypto/cipher/aes_icm.c
--- a/third_party/libsrtp/src/crypto/cipher/aes_icm_nss.c
+++ b/third_party/libsrtp/src/crypto/cipher/aes_icm_nss.c
--- a/third_party/libsrtp/src/crypto/cipher/aes_icm_ossl.c
+++ b/third_party/libsrtp/src/crypto/cipher/aes_icm_ossl.c
--- a/third_party/libsrtp/src/crypto/cipher/cipher.c
+++ b/third_party/libsrtp/src/crypto/cipher/cipher.c
--- a/third_party/libsrtp/src/crypto/cipher/null_cipher.c
+++ b/third_party/libsrtp/src/crypto/cipher/null_cipher.c
--- a/third_party/libsrtp/src/crypto/hash/auth.c
+++ b/third_party/libsrtp/src/crypto/hash/auth.c
--- a/third_party/libsrtp/src/crypto/hash/hmac.c
+++ b/third_party/libsrtp/src/crypto/hash/hmac.c
--- a/third_party/libsrtp/src/crypto/hash/hmac_ossl.c
+++ b/third_party/libsrtp/src/crypto/hash/hmac_ossl.c
--- a/third_party/libsrtp/src/crypto/hash/null_auth.c
+++ b/third_party/libsrtp/src/crypto/hash/null_auth.c
--- a/third_party/libsrtp/src/crypto/hash/sha1.c
+++ b/third_party/libsrtp/src/crypto/hash/sha1.c
--- a/third_party/libsrtp/src/crypto/include/aes.h
+++ b/third_party/libsrtp/src/crypto/include/aes.h
--- a/third_party/libsrtp/src/crypto/include/aes_gcm.h
+++ b/third_party/libsrtp/src/crypto/include/aes_gcm.h
--- a/third_party/libsrtp/src/crypto/include/aes_icm.h
+++ b/third_party/libsrtp/src/crypto/include/aes_icm.h
--- a/third_party/libsrtp/src/crypto/include/aes_icm_ext.h
+++ b/third_party/libsrtp/src/crypto/include/aes_icm_ext.h
--- a/third_party/libsrtp/src/crypto/include/alloc.h
+++ b/third_party/libsrtp/src/crypto/include/alloc.h
--- a/third_party/libsrtp/src/crypto/include/auth.h
+++ b/third_party/libsrtp/src/crypto/include/auth.h
--- a/third_party/libsrtp/src/crypto/include/cipher.h
+++ b/third_party/libsrtp/src/crypto/include/cipher.h
--- a/third_party/libsrtp/src/crypto/include/cipher_types.h
+++ b/third_party/libsrtp/src/crypto/include/cipher_types.h
--- a/third_party/libsrtp/src/crypto/include/crypto_kernel.h
+++ b/third_party/libsrtp/src/crypto/include/crypto_kernel.h
--- a/third_party/libsrtp/src/crypto/include/crypto_types.h
+++ b/third_party/libsrtp/src/crypto/include/crypto_types.h
--- a/third_party/libsrtp/src/crypto/include/datatypes.h
+++ b/third_party/libsrtp/src/crypto/include/datatypes.h
--- a/third_party/libsrtp/src/crypto/include/err.h
+++ b/third_party/libsrtp/src/crypto/include/err.h
--- a/third_party/libsrtp/src/crypto/include/hmac.h
+++ b/third_party/libsrtp/src/crypto/include/hmac.h
--- a/third_party/libsrtp/src/crypto/include/integers.h
+++ b/third_party/libsrtp/src/crypto/include/integers.h
--- a/third_party/libsrtp/src/crypto/include/key.h
+++ b/third_party/libsrtp/src/crypto/include/key.h
--- a/third_party/libsrtp/src/crypto/include/null_auth.h
+++ b/third_party/libsrtp/src/crypto/include/null_auth.h
--- a/third_party/libsrtp/src/crypto/include/null_cipher.h
+++ b/third_party/libsrtp/src/crypto/include/null_cipher.h
--- a/third_party/libsrtp/src/crypto/include/rdb.h
+++ b/third_party/libsrtp/src/crypto/include/rdb.h
--- a/third_party/libsrtp/src/crypto/include/rdbx.h
+++ b/third_party/libsrtp/src/crypto/include/rdbx.h
--- a/third_party/libsrtp/src/crypto/include/sha1.h
+++ b/third_party/libsrtp/src/crypto/include/sha1.h
--- a/third_party/libsrtp/src/crypto/include/stat.h
+++ b/third_party/libsrtp/src/crypto/include/stat.h
--- a/third_party/libsrtp/src/crypto/kernel/alloc.c
+++ b/third_party/libsrtp/src/crypto/kernel/alloc.c
--- a/third_party/libsrtp/src/crypto/kernel/crypto_kernel.c
+++ b/third_party/libsrtp/src/crypto/kernel/crypto_kernel.c
--- a/third_party/libsrtp/src/crypto/kernel/err.c
+++ b/third_party/libsrtp/src/crypto/kernel/err.c
--- a/third_party/libsrtp/src/crypto/kernel/key.c
+++ b/third_party/libsrtp/src/crypto/kernel/key.c
--- a/third_party/libsrtp/src/crypto/math/datatypes.c
+++ b/third_party/libsrtp/src/crypto/math/datatypes.c
--- a/third_party/libsrtp/src/crypto/math/stat.c
+++ b/third_party/libsrtp/src/crypto/math/stat.c
--- a/third_party/libsrtp/src/crypto/replay/rdb.c
+++ b/third_party/libsrtp/src/crypto/replay/rdb.c
--- a/third_party/libsrtp/src/crypto/replay/rdbx.c
+++ b/third_party/libsrtp/src/crypto/replay/rdbx.c
--- a/third_party/libsrtp/src/crypto/replay/ut_sim.c
+++ b/third_party/libsrtp/src/crypto/replay/ut_sim.c
--- a/third_party/libsrtp/src/crypto/test/aes_calc.c
+++ b/third_party/libsrtp/src/crypto/test/aes_calc.c
--- a/third_party/libsrtp/src/crypto/test/cipher_driver.c
+++ b/third_party/libsrtp/src/crypto/test/cipher_driver.c
--- a/third_party/libsrtp/src/crypto/test/datatypes_driver.c
+++ b/third_party/libsrtp/src/crypto/test/datatypes_driver.c
--- a/third_party/libsrtp/src/crypto/test/env.c
+++ b/third_party/libsrtp/src/crypto/test/env.c
--- a/third_party/libsrtp/src/crypto/test/kernel_driver.c
+++ b/third_party/libsrtp/src/crypto/test/kernel_driver.c
--- a/third_party/libsrtp/src/crypto/test/sha1_driver.c
+++ b/third_party/libsrtp/src/crypto/test/sha1_driver.c
--- a/third_party/libsrtp/src/crypto/test/stat_driver.c
+++ b/third_party/libsrtp/src/crypto/test/stat_driver.c
--- a/third_party/libsrtp/src/include/config.h
+++ b/third_party/libsrtp/src/include/config.h
--- a/third_party/libsrtp/src/include/ekt.h
+++ b/third_party/libsrtp/src/include/ekt.h
--- a/third_party/libsrtp/src/include/getopt_s.h
+++ b/third_party/libsrtp/src/include/getopt_s.h
--- a/third_party/libsrtp/src/include/srtp.h
+++ b/third_party/libsrtp/src/include/srtp.h
--- a/third_party/libsrtp/src/include/srtp_priv.h
+++ b/third_party/libsrtp/src/include/srtp_priv.h
--- a/third_party/libsrtp/src/include/ut_sim.h
+++ b/third_party/libsrtp/src/include/ut_sim.h
--- a/third_party/libsrtp/src/moz.build
+++ b/third_party/libsrtp/src/moz.build
--- a/third_party/libsrtp/src/srtp/ekt.c
+++ b/third_party/libsrtp/src/srtp/ekt.c
--- a/third_party/libsrtp/src/srtp/srtp.c
+++ b/third_party/libsrtp/src/srtp/srtp.c
--- a/third_party/libsrtp/src/test/cutest.h
+++ b/third_party/libsrtp/src/test/cutest.h
--- a/third_party/libsrtp/src/test/dtls_srtp_driver.c
+++ b/third_party/libsrtp/src/test/dtls_srtp_driver.c
--- a/third_party/libsrtp/src/test/getopt_s.c
+++ b/third_party/libsrtp/src/test/getopt_s.c
--- a/third_party/libsrtp/src/test/rdbx_driver.c
+++ b/third_party/libsrtp/src/test/rdbx_driver.c
--- a/third_party/libsrtp/src/test/replay_driver.c
+++ b/third_party/libsrtp/src/test/replay_driver.c
--- a/third_party/libsrtp/src/test/roc_driver.c
+++ b/third_party/libsrtp/src/test/roc_driver.c
--- a/third_party/libsrtp/src/test/rtp.c
+++ b/third_party/libsrtp/src/test/rtp.c
--- a/third_party/libsrtp/src/test/rtp.h
+++ b/third_party/libsrtp/src/test/rtp.h
--- a/third_party/libsrtp/src/test/rtp_decoder.c
+++ b/third_party/libsrtp/src/test/rtp_decoder.c
--- a/third_party/libsrtp/src/test/rtp_decoder.h
+++ b/third_party/libsrtp/src/test/rtp_decoder.h
--- a/third_party/libsrtp/src/test/rtpw.c
+++ b/third_party/libsrtp/src/test/rtpw.c
--- a/third_party/libsrtp/src/test/rtpw_test.sh
+++ b/third_party/libsrtp/src/test/rtpw_test.sh
--- a/third_party/libsrtp/src/test/rtpw_test_gcm.sh
+++ b/third_party/libsrtp/src/test/rtpw_test_gcm.sh
--- a/third_party/libsrtp/src/test/srtp_driver.c
+++ b/third_party/libsrtp/src/test/srtp_driver.c
--- a/third_party/libsrtp/src/test/test_srtp.c
+++ b/third_party/libsrtp/src/test/test_srtp.c
--- a/third_party/libsrtp/src/test/util.c
+++ b/third_party/libsrtp/src/test/util.c
--- a/third_party/libsrtp/src/test/util.h
+++ b/third_party/libsrtp/src/test/util.h
--- a/third_party/libsrtp/src/test/words.txt
+++ b/third_party/libsrtp/src/test/words.txt
--- a/third_party/libsrtp/srtp_update.log
+++ b/third_party/libsrtp/srtp_update.log
--- a/third_party/libsrtp/update_srtp.sh
+++ b/third_party/libsrtp/update_srtp.sh
--- 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')
+