From 09fabf025dc99992c6411b6c93a20ee0e1603047 Mon Sep 17 00:00:00 2001
From: Janis Danisevskis <jdanis@google.com>
Date: Mon, 25 Jan 2021 12:59:39 -0800
Subject: Keystore 2.0 SPI: Add NAMESPACE_WIFI.

Test: N/A
Bug: 171305388
Change-Id: I9003bb2754c2a09cdac77d86786d2e7d3dc05651
---
 .../java/android/security/keystore/KeyProperties.java     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'keystore')

diff --git a/keystore/java/android/security/keystore/KeyProperties.java b/keystore/java/android/security/keystore/KeyProperties.java
index 014d6882be8d..459c9af27ee8 100644
--- a/keystore/java/android/security/keystore/KeyProperties.java
+++ b/keystore/java/android/security/keystore/KeyProperties.java
@@ -20,6 +20,8 @@ import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.StringDef;
+import android.annotation.SystemApi;
+import android.os.Process;
 import android.security.KeyStore;
 import android.security.keymaster.KeymasterDefs;
 
@@ -874,8 +876,17 @@ public abstract class KeyProperties {
      * which it must be configured in SEPolicy.
      * @hide
      */
+    @SystemApi
     public static final int NAMESPACE_APPLICATION = -1;
 
+    /**
+     * The namespace identifier for the WIFI Keystore namespace.
+     * This must be kept in sync with system/sepolicy/private/keystore2_key_contexts
+     * @hide
+     */
+    @SystemApi
+    public static final int NAMESPACE_WIFI = 102;
+
     /**
      * For legacy support, translate namespaces into known UIDs.
      * @hide
@@ -884,6 +895,8 @@ public abstract class KeyProperties {
         switch (namespace) {
             case NAMESPACE_APPLICATION:
                 return KeyStore.UID_SELF;
+            case NAMESPACE_WIFI:
+                return Process.WIFI_UID;
             // TODO Translate WIFI and VPN UIDs once the namespaces are defined.
             //  b/171305388 and b/171305607
             default:
@@ -900,6 +913,8 @@ public abstract class KeyProperties {
         switch (uid) {
             case KeyStore.UID_SELF:
                 return NAMESPACE_APPLICATION;
+            case Process.WIFI_UID:
+                return NAMESPACE_WIFI;
             // TODO Translate WIFI and VPN UIDs once the namespaces are defined.
             //  b/171305388 and b/171305607
             default:
-- 
cgit v1.2.3