From 11cd7e689407da47e952216067a51f173b3e92f1 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 17 Jul 2023 21:08:45 +0000 Subject: [PATCH] Remove obsolete comment from FileIntegrityService Since fsverity builtin signatures are no longer being used, the comment in FileIntegrityService#loadAllCertificates() no longer applies. Bug: 290064770 Test: comment-only change Change-Id: I78ca3868dabe3133c7e521a5dc8fcc8cd598ac3c --- .../com/android/server/security/FileIntegrityService.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/core/java/com/android/server/security/FileIntegrityService.java b/services/core/java/com/android/server/security/FileIntegrityService.java index 466ac74a83225..bdeb9a8e13cb3 100644 --- a/services/core/java/com/android/server/security/FileIntegrityService.java +++ b/services/core/java/com/android/server/security/FileIntegrityService.java @@ -125,13 +125,7 @@ public class FileIntegrityService extends SystemService { } private void loadAllCertificates() { - // A better alternative to load certificates would be to read from .fs-verity kernel - // keyring, which fsverity_init loads to during earlier boot time from the same sources - // below. But since the read operation from keyring is not provided in kernel, we need to - // duplicate the same loading logic here. - // Load certificates trusted by the device manufacturer. - // NB: Directories need to be synced with system/security/fsverity_init/fsverity_init.cpp. final String relativeDir = "etc/security/fsverity"; loadCertificatesFromDirectory(Environment.getRootDirectory().toPath() .resolve(relativeDir));