From 4bf583aaa23700ec92df0fcf1b9d8978e29199f7 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 21 Jul 2016 17:14:07 -0400
Subject: SL-429: Use a new certificate authority bundle based on data from
 Mozilla

---
 indra/cmake/Copy3rdPartyLibs.cmake | 7 -------
 indra/cmake/LLCA.cmake             | 4 ++++
 2 files changed, 4 insertions(+), 7 deletions(-)
 create mode 100644 indra/cmake/LLCA.cmake

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 70d85b864c..9a28b85c00 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -20,11 +20,8 @@ if(WINDOWS)
     set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         SLVoice.exe
-        ca-bundle.crt
-        libsndfile-1.dll
         vivoxsdk.dll
         ortp.dll
-        vivoxoal.dll
         )
 
     #*******************************
@@ -158,9 +155,6 @@ elseif(DARWIN)
     set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         SLVoice
-        ca-bundle.crt
-        libsndfile.dylib
-        libvivoxoal.dylib
         libortp.dylib
         libvivoxplatform.dylib
         libvivoxsdk.dylib
@@ -202,7 +196,6 @@ elseif(LINUX)
         libvivoxplatform.so
         libvivoxsdk.so
         SLVoice
-        # ca-bundle.crt   #No cert for linux.  It is actually still 3.2SDK.
        )
     # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
     # or ARCH_PREBUILT_DIRS
diff --git a/indra/cmake/LLCA.cmake b/indra/cmake/LLCA.cmake
new file mode 100644
index 0000000000..412a5a99a4
--- /dev/null
+++ b/indra/cmake/LLCA.cmake
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+use_prebuilt_binary(llca)
-- 
cgit v1.2.3