commit 670ca4f29dcf767ba2e66718fd1ca36c7f3e6464
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 07 17:17:52 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 07 17:17:52 2022 +0000
tree 5dd1bbddd924cd981031f2e13b9326dc78f62144
parent 003e381103019230fc330179e32698f6d66243e5
parent 1b8ac1a87982424482d9ef0c464f1a0af6598ca3

Merge "Do not require fs-verity built-in signature"

fsverity_init/main.cpp

diff --git a/fsverity_init/main.cpp b/fsverity_init/main.cpp
index 3f75dca..b502b91 100644
--- a/fsverity_init/main.cpp
+++ b/fsverity_init/main.cpp
@@ -48,12 +48,6 @@
             return -1;
         }
     } else if (command == "--lock") {
-        // Requires files backed by fs-verity to be verified with a key in .fs-verity
-        // keyring.
-        if (!android::base::WriteStringToFile("1", "/proc/sys/fs/verity/require_signatures")) {
-            PLOG(ERROR) << "Failed to enforce fs-verity signature";
-        }
-
         if (!android::base::GetBoolProperty("ro.debuggable", false)) {
             if (keyctl_restrict_keyring(keyring_id, nullptr, nullptr) < 0) {
                 PLOG(ERROR) << "Cannot restrict .fs-verity keyring";