From 2b3d7bf5ce742ca422863bed68b7a826160d069a Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Wed, 8 Dec 2021 22:36:23 -0700
Subject: [PATCH] Drop 1201 Root CA usage in favor of new setup

---
 scripts/upload-logs                |  1 -
 scripts/wk/cfg/net.py              | 10 ++++-----
 scripts/wk/graph.py                |  1 -
 scripts/wk/std.py                  |  1 -
 setup/build_macos                  |  4 ----
 setup/windows/bin/1201_Root_CA.crt | 36 ------------------------------
 6 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 setup/windows/bin/1201_Root_CA.crt

diff --git a/scripts/upload-logs b/scripts/upload-logs
index 54d80e18..54914784 100755
--- a/scripts/upload-logs
+++ b/scripts/upload-logs
@@ -59,7 +59,6 @@ def compress_and_upload(reason='Testing'):
   # Compress LOG_DIR (relative to parent dir)
   if os.path.exists('/.wk-live-macos'):
     dest = compress_live_macos(reason)
-    upload_args['verify'] = '/.1201_Root_CA.crt'
   else:
     dest = compress(reason)
   upload_args['data'] = dest.read_bytes()
diff --git a/scripts/wk/cfg/net.py b/scripts/wk/cfg/net.py
index caec4ea4..4ce54bab 100644
--- a/scripts/wk/cfg/net.py
+++ b/scripts/wk/cfg/net.py
@@ -15,15 +15,15 @@ BACKUP_SERVERS = {
   }
 BENCHMARK_SERVER = {
   'Name':       'Nextcloud',
-  'Short Url':  'https://nextcloud.1201.com/index.php/f/108024',
-  'Url':        'https://1201.ddns.net:8001/public.php/webdav/Benchmarks',
-  'User':       'QAx28ZgmPwCwGHc',
+  'Short Url':  'https://1201.ddns.net/nextcloud/f/14775',
+  'Url':        'https://1201.ddns.net/nextcloud/public.php/webdav/Benchmarks',
+  'User':       'LHdPTofNBQNGBbX',
   'Pass':       '',
 }
 CRASH_SERVER = {
   'Name':       'Nextcloud',
-  'Url':        'https://1201.ddns.net:8001/public.php/webdav/Issues',
-  'User':       'n9Ds76WizNyBw8Y',
+  'Url':        'https://1201.ddns.net/nextcloud/public.php/webdav/Issues',
+  'User':       'fnyzeK64rKxcEL4',
   'Pass':       '',
   'Headers':    {'X-Requested-With': 'XMLHttpRequest'},
   }
diff --git a/scripts/wk/graph.py b/scripts/wk/graph.py
index 913e0f9c..e84b57f8 100644
--- a/scripts/wk/graph.py
+++ b/scripts/wk/graph.py
@@ -220,7 +220,6 @@ def upload_to_nextcloud(image_path, ticket_number, dev_name):
     data=image_data,
     headers={'X-Requested-With': 'XMLHttpRequest'},
     auth=(BENCHMARK_SERVER['User'], BENCHMARK_SERVER['Pass']),
-    verify='/usr/local/bin/wk/cfg/1201_Root_CA.crt',
     )
 
   # Return folder link
diff --git a/scripts/wk/std.py b/scripts/wk/std.py
index 6f994bc7..c811bdc5 100644
--- a/scripts/wk/std.py
+++ b/scripts/wk/std.py
@@ -1087,7 +1087,6 @@ def upload_debug_report(report, compress=True, reason='DEBUG'):
     data=xz_report if compress else report,
     headers=headers,
     auth=(CRASH_SERVER['User'], CRASH_SERVER.get('Pass', '')),
-    verify='/usr/local/bin/wk/cfg/1201_Root_CA.crt',
     )
 
   # Check response
diff --git a/setup/build_macos b/setup/build_macos
index eced9bbf..6dfb93e6 100755
--- a/setup/build_macos
+++ b/setup/build_macos
@@ -65,10 +65,6 @@ elif [[ "${OS_VERSION:0:5}" == "10.15" ]]; then
   cp -a "${MACOS_DIR}/Catalina/Utilities.plist" "${WK_PATH}/System/Installation/CDIS/macOS Utilities.app/Contents/Resources/Utilities.plist"
 fi
 
-# 1201 CA
-echo "Installing 1201 CA..."
-cp -a ../windows/bin/1201_Root_CA.crt "${WK_PATH}/.1201_Root_CA.crt"
-
 # Dropbear (SSH)
 echo "Installing Dropbear..."
 mkdir -p "${WK_PATH}/etc/dropbear"
diff --git a/setup/windows/bin/1201_Root_CA.crt b/setup/windows/bin/1201_Root_CA.crt
deleted file mode 100644
index 7d8ae206..00000000
--- a/setup/windows/bin/1201_Root_CA.crt
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN CERTIFICATE-----
-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
------END CERTIFICATE-----