From 82a96584693c8fdf760c6d1650d05e33f9ca1eba Mon Sep 17 00:00:00 2001
From: phoeagon <phoeagon@gmail.com>
Date: Tue, 24 Feb 2015 19:08:23 +0800
Subject: [PATCH] Add prebuilt configuration files to repo. Adding Chinese
 README including brief instructions

---
 Android/README.md                             | 32 ++++++++++++++-
 Android/README_zhCN.md                        | 40 +++++++++++++++++++
 .../data/misc/keychain/pubkey_blacklist.txt   |  2 +-
 .../data/misc/keychain/serial_blacklist.txt   |  2 +-
 Android/make.sh                               | 18 +++++++++
 Android/prebuilt/all/pubkey_blacklist.txt     |  1 +
 Android/prebuilt/all/rooted.sh                |  9 +++++
 Android/prebuilt/all/serial_blacklist.txt     |  1 +
 Android/prebuilt/base/pubkey_blacklist.txt    |  1 +
 Android/prebuilt/base/rooted.sh               |  9 +++++
 Android/prebuilt/base/serial_blacklist.txt    |  1 +
 .../prebuilt/extended/pubkey_blacklist.txt    |  1 +
 Android/prebuilt/extended/rooted.sh           |  9 +++++
 .../prebuilt/extended/serial_blacklist.txt    |  1 +
 Android/prebuilt/restore/pubkey_blacklist.txt |  1 +
 Android/prebuilt/restore/rooted.sh            |  9 +++++
 Android/prebuilt/restore/serial_blacklist.txt |  1 +
 Android/pubkey_blacklist.txt                  |  2 +-
 Android/serial_blacklist.txt                  |  2 +-
 19 files changed, 137 insertions(+), 5 deletions(-)
 create mode 100644 Android/README_zhCN.md
 create mode 100755 Android/make.sh
 create mode 100644 Android/prebuilt/all/pubkey_blacklist.txt
 create mode 100644 Android/prebuilt/all/rooted.sh
 create mode 100644 Android/prebuilt/all/serial_blacklist.txt
 create mode 100644 Android/prebuilt/base/pubkey_blacklist.txt
 create mode 100644 Android/prebuilt/base/rooted.sh
 create mode 100644 Android/prebuilt/base/serial_blacklist.txt
 create mode 100644 Android/prebuilt/extended/pubkey_blacklist.txt
 create mode 100644 Android/prebuilt/extended/rooted.sh
 create mode 100644 Android/prebuilt/extended/serial_blacklist.txt
 create mode 100644 Android/prebuilt/restore/pubkey_blacklist.txt
 create mode 100644 Android/prebuilt/restore/rooted.sh
 create mode 100644 Android/prebuilt/restore/serial_blacklist.txt

diff --git a/Android/README.md b/Android/README.md
index 1f16190..d42ab77 100644
--- a/Android/README.md
+++ b/Android/README.md
@@ -8,7 +8,37 @@ Android 4.1+ device.
 
 This utility blacklists CA and EE certificates.
 
-## Usage
+## Usage -- Use prebuilt configurations (Recommended)
+
+### With root access
+
+Assuming you have root access on your phone, `cd` into the folder whose
+name corresponds to the config you want (RESTORE, ALL, EXTENDED or BASE).
+
+        git clone [REPO_ADDRESS]
+        cd Android/prebuilt/[type]
+        ./rooted.sh
+
+If you are on windows and do not have BASH, use:
+
+        git clone [REPO_ADDRESS]
+        cd Android/prebuilt/[type]
+        adb push pubkey_blacklist.txt /sdcard/pubkey_blacklist.txt
+        adb push serial_blacklist.txt /sdcard/serial_blacklist.txt
+
+        adb shell su -c "cp /sdcard/pubkey_blacklist.txt /data/misc/keychain/pubkey_blacklist.txt"
+        adb shell su -c "cp /sdcard/serial_blacklist.txt /data/misc/keychain/serial_blacklist.txt"
+
+### Without root access
+
+        git clone [REPO_ADDRESS]
+        cd Android/prebuilt/[type]
+        adb push flashable.zip /sdcard/update.zip
+        # Reboot phone to recovery
+        adb reboot recovery
+        # Now flash the zip file using your custom recovery
+
+## Usage -- Building from source
 
 First, use `git` to clone the whole repo. `cd` to this dir. Use `generate.sh`
 to generate the configuration files you need.
diff --git a/Android/README_zhCN.md b/Android/README_zhCN.md
new file mode 100644
index 0000000..307e9cc
--- /dev/null
+++ b/Android/README_zhCN.md
@@ -0,0 +1,40 @@
+Androidè¯ä¹¦å±è”½
+=====================================================
+
+æœ¬å·¥å…·ä¸ºAndroid 4.1æˆ–ä»¥ä¸Šä¹‹è®¾å¤‡å®‰è£…ç”¨äºŽå±è”½æŸäº›æ•°å—è¯ä¹¦çš„é…ç½®ã€‚
+
+## ç®€ä»‹
+
+æœ¬å·¥å…·å®‰è£…çš„é…ç½®æ–‡ä»¶å°†å±è”½æŸäº›CAå’ŒEEè¯ä¹¦ã€‚
+
+## æŽ¨èç”¨æ³•
+
+### æœ‰ root æƒé™
+
+è‹¥æ‚¨æŒæœ‰å¾…é…ç½®ä¹‹Androidè®¾å¤‡rootè®¿é—®ï¼Œè¯·åœ¨`cd`è¿›å…¥å¯¹åº”åç§°çš„æ–‡ä»¶å¤¹ä¸
+(RESTORE, ALL, EXTENDED or BASEï¼Œ æŽ¨èextended)ï¼Œå¹¶è°ƒç”¨root.shæ–‡ä»¶å®‰è£…å…¥å¯¹åº”çš„é…ç½®æ–‡ä»¶ã€‚
+
+        git clone [REPO_ADDRESS]
+        cd Android/prebuilt/[type]
+        ./rooted.sh
+
+è‹¥æ‚¨ä½¿ç”¨Windowså¹³å°ä¸”æœªæœ‰BASHï¼Œè¯·åœ¨å‘½ä»¤è¡Œä¸è¿è¡Œï¼š
+
+        git clone [REPO_ADDRESS]
+        cd Android/prebuilt/[type]
+        adb push pubkey_blacklist.txt /sdcard/pubkey_blacklist.txt
+        adb push serial_blacklist.txt /sdcard/serial_blacklist.txt
+
+        adb shell su -c "cp /sdcard/pubkey_blacklist.txt /data/misc/keychain/pubkey_blacklist.txt"
+        adb shell su -c "cp /sdcard/serial_blacklist.txt /data/misc/keychain/serial_blacklist.txt"
+
+### è‹¥æ—  root æƒé™
+
+        git clone [REPO_ADDRESS]
+        cd Android/prebuilt/[type]
+        adb push flashable.zip /sdcard/update.zip
+        # ä¸‹é¢å‘½ä»¤å°†é‡å¯æ‚¨çš„Androidè®¾å¤‡è‡³recoveryçŠ¶æ€
+        adb reboot recovery
+        # è¯·ä½¿ç”¨recoveryåˆ·å…¥zipåŒ…
+
+æ›´å…·ä½“çš„ä½¿ç”¨æ–¹æ³•ï¼Œè¯¦è§README.md
diff --git a/Android/flashable/data/misc/keychain/pubkey_blacklist.txt b/Android/flashable/data/misc/keychain/pubkey_blacklist.txt
index b4504a6..e223c29 100644
--- a/Android/flashable/data/misc/keychain/pubkey_blacklist.txt
+++ b/Android/flashable/data/misc/keychain/pubkey_blacklist.txt
@@ -1 +1 @@
-5f3ab33d55007054bc5e3e5553cd8d8465d77c61,783333c9687df63377efceddd82efa9101913e8e,
+5f3ab33d55007054bc5e3e5553cd8d8465d77c61,783333c9687df63377efceddd82efa9101913e8e,bb2d75ce172accdf05d9a86d278298889986c891,55921a5b2e62b0e07b8ba9ae9ffca0f6e656263c,4bd5e15116a2a7eda3a5c7e0ffb187180ec0e3d5,1bcdfe7c5a0832b44f7e533b8f927881c7932dc1,8080355e6edde7f01bf7d9d340d9e0ef52c3c1cd,
diff --git a/Android/flashable/data/misc/keychain/serial_blacklist.txt b/Android/flashable/data/misc/keychain/serial_blacklist.txt
index ef45938..b370753 100644
--- a/Android/flashable/data/misc/keychain/serial_blacklist.txt
+++ b/Android/flashable/data/misc/keychain/serial_blacklist.txt
@@ -1 +1 @@
-827,864,
+827,864,a40fd55e2a14343323a8d407a2255ae8,3,17,f0c1fb04dd2c9ed8f94f0820591e72ad,29,6497d09c3bbc9baf857ed3c29a31d1ec,2c,27,
diff --git a/Android/make.sh b/Android/make.sh
new file mode 100755
index 0000000..b9d8588
--- /dev/null
+++ b/Android/make.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# This script is used to generate configurations by the author.
+# The generated content is already included in the repo and you should
+# not need to manually run this one.
+
+# remove files
+echo "Purging old files..."
+rm -rf prebuilt
+mkdir prebuilt
+
+echo "Building new configurations"
+for type in `echo all restore extended base`;do
+    mkdir prebuilt/$type
+    bash generate.sh $type
+    cp *_blacklist.txt prebuilt/$type/
+    cp flashable.zip prebuilt/$type/
+    cp rooted.sh prebuilt/$type
+done
diff --git a/Android/prebuilt/all/pubkey_blacklist.txt b/Android/prebuilt/all/pubkey_blacklist.txt
new file mode 100644
index 0000000..abdf6a1
--- /dev/null
+++ b/Android/prebuilt/all/pubkey_blacklist.txt
@@ -0,0 +1 @@
+5f3ab33d55007054bc5e3e5553cd8d8465d77c61,783333c9687df63377efceddd82efa9101913e8e,699f1b7ae9b8da18496c608bce4f4eaaf9f0b7aa,c206fbd53bba0ceef2d2d2453d0752263a9fe75f,c206fbd53bba0ceef2d2d2453d0752263a9fe75f,699f1b7ae9b8da18496c608bce4f4eaaf9f0b7aa,699f1b7ae9b8da18496c608bce4f4eaaf9f0b7aa,699f1b7ae9b8da18496c608bce4f4eaaf9f0b7aa,699f1b7ae9b8da18496c608bce4f4eaaf9f0b7aa,699f1b7ae9b8da18496c608bce4f4eaaf9f0b7aa,3592761947e2907b7ac880f429bf2be66c81511a,8476c303b2e34d57fd0645a7c4315f2dbeaaf0a4,8476c303b2e34d57fd0645a7c4315f2dbeaaf0a4,bb2d75ce172accdf05d9a86d278298889986c891,313f4613292545f326f99ed52f39984851290f4d,55921a5b2e62b0e07b8ba9ae9ffca0f6e656263c,4bd5e15116a2a7eda3a5c7e0ffb187180ec0e3d5,999b76540b4a9c7a35ca8f0f2eaa747a0faec56e,59c4eac320386f231960f00c9a40575e15fcf7fc,8e50b2eaf0918b206ac00ea293e19e56e0a35eb0,9bc82bc98b8b7e0f04e32c98855cd5d2240fd683,338201361c67b6b318e8f5d1d9aaab0366094fec,e167132d8a321df76ef8c4437b0501ffd1326fd8,1385e3b2cfb0acf63bd1c1341323cd1b6874b08b,53b4fcaf73a83f05aada6591db7de0ec2f1eb1f2,91006fb7f72ea6e663728df481d33c3eecc62595,1bcdfe7c5a0832b44f7e533b8f927881c7932dc1,051c6d0c7ca9b0d9b9e50a5bc8f9f5e38348eb78,c8188f7a06a99bf579dd9f8896afd1d91f19bc2a,512f553fc62ace8ab3852d74cade03e78d8d9ef1,01a17a5d694770dcd773ea9161a7cba09cf886c6,2cdd8e7bef3b800169a389712256018a6337f416,1af49f3422fb42ac986d0a59a898d99eac88554a,2b4da71b2b88d19b8b83e66bc088e3847cc67cb7,380a68cc29a7a9c9b1a4ef80a2974e1074041bb5,ae9d8d5e418c1bfbade8f4574dc43758ea628289,8080355e6edde7f01bf7d9d340d9e0ef52c3c1cd,361a7afb69a9add6ba6f295e0aedaeba7fcd4a69,28a4baee613e0ab8158395654e4fcc13c170e3e3,90e241c211418b95b1a9e09c37247e849fe4bea1,f8920be908a9c5d5a0fbf39aaa98a5743749ad9f,ad0e6682a87932e81c8bc594049ed7d0aec958e8,8a534b089bc61c824d694f55d9c902a58c67b661,79ef6f41e89da009aefc1c00289fd3a301fae845,68c76297f5f2e7c3ceea09d195f48971ca7ab97e,d69f981e878991857486449306aa950c8283035f,de87a22419f1c1c39ed12d43dfa740de8372b097,3f89633e2cd86a916895b3af56afa2ed31490e73,f9dae5809fd2d82419aa30c7f903640a55df944f,58f4733635ba21d4d9d63f2dcdec69bcb7d45dde,aeeca8e857e9bf7da296c473c071f8cabc31999f,3f89633e2cd86a916895b3af56afa2ed31490e73,f9dae5809fd2d82419aa30c7f903640a55df944f,58f4733635ba21d4d9d63f2dcdec69bcb7d45dde,aeeca8e857e9bf7da296c473c071f8cabc31999f,
diff --git a/Android/prebuilt/all/rooted.sh b/Android/prebuilt/all/rooted.sh
new file mode 100644
index 0000000..454ca6c
--- /dev/null
+++ b/Android/prebuilt/all/rooted.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+adb push pubkey_blacklist.txt /sdcard/pubkey_blacklist.txt
+adb push serial_blacklist.txt /sdcard/serial_blacklist.txt
+
+adb shell su -c "cp /sdcard/pubkey_blacklist.txt /data/misc/keychain/pubkey_blacklist.txt"
+adb shell su -c "cp /sdcard/serial_blacklist.txt /data/misc/keychain/serial_blacklist.txt"
+
+echo "Please reboot your phone"
diff --git a/Android/prebuilt/all/serial_blacklist.txt b/Android/prebuilt/all/serial_blacklist.txt
new file mode 100644
index 0000000..b370753
--- /dev/null
+++ b/Android/prebuilt/all/serial_blacklist.txt
@@ -0,0 +1 @@
+827,864,a40fd55e2a14343323a8d407a2255ae8,3,17,f0c1fb04dd2c9ed8f94f0820591e72ad,29,6497d09c3bbc9baf857ed3c29a31d1ec,2c,27,
diff --git a/Android/prebuilt/base/pubkey_blacklist.txt b/Android/prebuilt/base/pubkey_blacklist.txt
new file mode 100644
index 0000000..e223c29
--- /dev/null
+++ b/Android/prebuilt/base/pubkey_blacklist.txt
@@ -0,0 +1 @@
+5f3ab33d55007054bc5e3e5553cd8d8465d77c61,783333c9687df63377efceddd82efa9101913e8e,bb2d75ce172accdf05d9a86d278298889986c891,55921a5b2e62b0e07b8ba9ae9ffca0f6e656263c,4bd5e15116a2a7eda3a5c7e0ffb187180ec0e3d5,1bcdfe7c5a0832b44f7e533b8f927881c7932dc1,8080355e6edde7f01bf7d9d340d9e0ef52c3c1cd,
diff --git a/Android/prebuilt/base/rooted.sh b/Android/prebuilt/base/rooted.sh
new file mode 100644
index 0000000..454ca6c
--- /dev/null
+++ b/Android/prebuilt/base/rooted.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+adb push pubkey_blacklist.txt /sdcard/pubkey_blacklist.txt
+adb push serial_blacklist.txt /sdcard/serial_blacklist.txt
+
+adb shell su -c "cp /sdcard/pubkey_blacklist.txt /data/misc/keychain/pubkey_blacklist.txt"
+adb shell su -c "cp /sdcard/serial_blacklist.txt /data/misc/keychain/serial_blacklist.txt"
+
+echo "Please reboot your phone"
diff --git a/Android/prebuilt/base/serial_blacklist.txt b/Android/prebuilt/base/serial_blacklist.txt
new file mode 100644
index 0000000..b370753
--- /dev/null
+++ b/Android/prebuilt/base/serial_blacklist.txt
@@ -0,0 +1 @@
+827,864,a40fd55e2a14343323a8d407a2255ae8,3,17,f0c1fb04dd2c9ed8f94f0820591e72ad,29,6497d09c3bbc9baf857ed3c29a31d1ec,2c,27,
diff --git a/Android/prebuilt/extended/pubkey_blacklist.txt b/Android/prebuilt/extended/pubkey_blacklist.txt
new file mode 100644
index 0000000..5415b79
--- /dev/null
+++ b/Android/prebuilt/extended/pubkey_blacklist.txt
@@ -0,0 +1 @@
+5f3ab33d55007054bc5e3e5553cd8d8465d77c61,783333c9687df63377efceddd82efa9101913e8e,3592761947e2907b7ac880f429bf2be66c81511a,8476c303b2e34d57fd0645a7c4315f2dbeaaf0a4,8476c303b2e34d57fd0645a7c4315f2dbeaaf0a4,bb2d75ce172accdf05d9a86d278298889986c891,55921a5b2e62b0e07b8ba9ae9ffca0f6e656263c,4bd5e15116a2a7eda3a5c7e0ffb187180ec0e3d5,1bcdfe7c5a0832b44f7e533b8f927881c7932dc1,ae9d8d5e418c1bfbade8f4574dc43758ea628289,8080355e6edde7f01bf7d9d340d9e0ef52c3c1cd,79ef6f41e89da009aefc1c00289fd3a301fae845,68c76297f5f2e7c3ceea09d195f48971ca7ab97e,d69f981e878991857486449306aa950c8283035f,de87a22419f1c1c39ed12d43dfa740de8372b097,
diff --git a/Android/prebuilt/extended/rooted.sh b/Android/prebuilt/extended/rooted.sh
new file mode 100644
index 0000000..454ca6c
--- /dev/null
+++ b/Android/prebuilt/extended/rooted.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+adb push pubkey_blacklist.txt /sdcard/pubkey_blacklist.txt
+adb push serial_blacklist.txt /sdcard/serial_blacklist.txt
+
+adb shell su -c "cp /sdcard/pubkey_blacklist.txt /data/misc/keychain/pubkey_blacklist.txt"
+adb shell su -c "cp /sdcard/serial_blacklist.txt /data/misc/keychain/serial_blacklist.txt"
+
+echo "Please reboot your phone"
diff --git a/Android/prebuilt/extended/serial_blacklist.txt b/Android/prebuilt/extended/serial_blacklist.txt
new file mode 100644
index 0000000..b370753
--- /dev/null
+++ b/Android/prebuilt/extended/serial_blacklist.txt
@@ -0,0 +1 @@
+827,864,a40fd55e2a14343323a8d407a2255ae8,3,17,f0c1fb04dd2c9ed8f94f0820591e72ad,29,6497d09c3bbc9baf857ed3c29a31d1ec,2c,27,
diff --git a/Android/prebuilt/restore/pubkey_blacklist.txt b/Android/prebuilt/restore/pubkey_blacklist.txt
new file mode 100644
index 0000000..b4504a6
--- /dev/null
+++ b/Android/prebuilt/restore/pubkey_blacklist.txt
@@ -0,0 +1 @@
+5f3ab33d55007054bc5e3e5553cd8d8465d77c61,783333c9687df63377efceddd82efa9101913e8e,
diff --git a/Android/prebuilt/restore/rooted.sh b/Android/prebuilt/restore/rooted.sh
new file mode 100644
index 0000000..454ca6c
--- /dev/null
+++ b/Android/prebuilt/restore/rooted.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+adb push pubkey_blacklist.txt /sdcard/pubkey_blacklist.txt
+adb push serial_blacklist.txt /sdcard/serial_blacklist.txt
+
+adb shell su -c "cp /sdcard/pubkey_blacklist.txt /data/misc/keychain/pubkey_blacklist.txt"
+adb shell su -c "cp /sdcard/serial_blacklist.txt /data/misc/keychain/serial_blacklist.txt"
+
+echo "Please reboot your phone"
diff --git a/Android/prebuilt/restore/serial_blacklist.txt b/Android/prebuilt/restore/serial_blacklist.txt
new file mode 100644
index 0000000..ef45938
--- /dev/null
+++ b/Android/prebuilt/restore/serial_blacklist.txt
@@ -0,0 +1 @@
+827,864,
diff --git a/Android/pubkey_blacklist.txt b/Android/pubkey_blacklist.txt
index b4504a6..e223c29 100644
--- a/Android/pubkey_blacklist.txt
+++ b/Android/pubkey_blacklist.txt
@@ -1 +1 @@
-5f3ab33d55007054bc5e3e5553cd8d8465d77c61,783333c9687df63377efceddd82efa9101913e8e,
+5f3ab33d55007054bc5e3e5553cd8d8465d77c61,783333c9687df63377efceddd82efa9101913e8e,bb2d75ce172accdf05d9a86d278298889986c891,55921a5b2e62b0e07b8ba9ae9ffca0f6e656263c,4bd5e15116a2a7eda3a5c7e0ffb187180ec0e3d5,1bcdfe7c5a0832b44f7e533b8f927881c7932dc1,8080355e6edde7f01bf7d9d340d9e0ef52c3c1cd,
diff --git a/Android/serial_blacklist.txt b/Android/serial_blacklist.txt
index ef45938..b370753 100644
--- a/Android/serial_blacklist.txt
+++ b/Android/serial_blacklist.txt
@@ -1 +1 @@
-827,864,
+827,864,a40fd55e2a14343323a8d407a2255ae8,3,17,f0c1fb04dd2c9ed8f94f0820591e72ad,29,6497d09c3bbc9baf857ed3c29a31d1ec,2c,27,
-- 
GitLab