Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f75d709 authored by Chung-yih Wang's avatar Chung-yih Wang
Browse files

Add VPN and Keystore services and data directories. 

-- changed the default mode to 0770 for keystore with the new user 'keystore'.
-- add the keystore service providing the basic key lookup/install/remove, but
  only keystore user can access the key content.
parent 17df71e0

include/private/android_filesystem_config.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -50,6 +50,7 @@ 
#define AID_DHCP          1014  /* dhcp client */

#define AID_DHCP          1014  /* dhcp client */

#define AID_SDCARD_RW     1015  /* external storage write access */

#define AID_SDCARD_RW     1015  /* external storage write access */

#define AID_VPN           1016  /* vpn system */

#define AID_VPN           1016  /* vpn system */

#define AID_KEYSTORE      1017  /* keystore subsystem */





#define AID_SHELL         2000  /* adb and debug shell user */

#define AID_SHELL         2000  /* adb and debug shell user */

#define AID_CACHE         2001  /* cache access */

#define AID_CACHE         2001  /* cache access */
@@ -97,6 +98,7 @@ static struct android_id_info android_ids[] = { 
    { "net_bt",    AID_NET_BT, },

    { "net_bt",    AID_NET_BT, },

    { "sdcard_rw", AID_SDCARD_RW, },

    { "sdcard_rw", AID_SDCARD_RW, },

    { "vpn",       AID_VPN, },

    { "vpn",       AID_VPN, },

    { "keystore",  AID_KEYSTORE, },

    { "inet",      AID_INET, },

    { "inet",      AID_INET, },

    { "net_raw",   AID_NET_RAW, },

    { "net_raw",   AID_NET_RAW, },

    { "misc",      AID_MISC, },

    { "misc",      AID_MISC, },

rootdir/init.rc

+20 −1
Original line number Original line Diff line number Diff line
@@ -74,6 +74,9 @@ loglevel 3 
# create basic filesystem structure

# create basic filesystem structure

    mkdir /data/misc 01771 system misc

    mkdir /data/misc 01771 system misc

    mkdir /data/misc/hcid 0770 bluetooth bluetooth

    mkdir /data/misc/hcid 0770 bluetooth bluetooth

    mkdir /data/misc/keystore 0770 keystore keystore

    mkdir /data/misc/vpn 0770 system system

    mkdir /data/misc/vpn/profiles 0770 system system

    mkdir /data/local 0771 shell shell

    mkdir /data/local 0771 shell shell

    mkdir /data/local/tmp 0771 shell shell

    mkdir /data/local/tmp 0771 shell shell

    mkdir /data/data 0771 system system

    mkdir /data/data 0771 system system
@@ -284,3 +287,19 @@ service installd /system/bin/installd 




service flash_recovery /system/bin/flash_image recovery /system/recovery.img

service flash_recovery /system/bin/flash_image recovery /system/recovery.img

    oneshot

    oneshot



service racoon /system/bin/racoon -F -f /etc/racoon/racoon.conf

    socket racoon stream 600 system system

    disabled

    oneshot



service mtpd /system/bin/mtpd

    socket mtpd stream 600 system system

    disabled

    oneshot



service keystore /system/bin/keystore

    user keystore

    group keystore

    socket keystore stream 666