Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add conscrypt updatable certificates." am: 0b62dccbbc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2323439

Change-Id: I4b5a5162437711aca86431cafd4f99e6ad0f6e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miguel Aranda
2022-12-21 23:58:15 +00:00
committed by Automerger Merge Worker
parent 2092245ab7 0b62dccbbc
commit cd3609306d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/security/net/config/SystemCertificateSource.java
View File

@@ -18,6 +18,7 @@ package android.security.net.config;
import android.os.Environment; import android.os.Environment;
import android.os.UserHandle; import android.os.UserHandle;
import java.io.File; import java.io.File;
/** /**
@@ -32,11 +33,20 @@ public final class SystemCertificateSource extends DirectoryCertificateSource {
private final File mUserRemovedCaDir; private final File mUserRemovedCaDir;
private SystemCertificateSource() { private SystemCertificateSource() {
super(new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts")); super(getDirectory());
File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId()); File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId());
mUserRemovedCaDir = new File(configDir, "cacerts-removed"); mUserRemovedCaDir = new File(configDir, "cacerts-removed");
} }
private static File getDirectory() {
// TODO(miguelaranda): figure out correct code path.
File updatable_dir = new File("/apex/com.android.conscrypt/cacerts");
if (updatable_dir.exists()) {
return updatable_dir;
}
return new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts");
}
public static SystemCertificateSource getInstance() { public static SystemCertificateSource getInstance() {
return NoPreloadHolder.INSTANCE; return NoPreloadHolder.INSTANCE;
} }