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

Commit b7455404 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Run and log BoringSSL self-test for NIAP compliance. 

Bug: 70886042
Test: manual, using "adb shell su system logcat -b security"
Change-Id: I46f243838e2fb432995c7c89e4279d36a4788678
parent 0ee9c0db

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6739,6 +6739,7 @@ package android.app.admin { 
    field public static final int TAG_APP_PROCESS_START = 210005; // 0x33455

    field public static final int TAG_CERT_AUTHORITY_INSTALLED = 210029; // 0x3346d

    field public static final int TAG_CERT_AUTHORITY_REMOVED = 210030; // 0x3346e

    field public static final int TAG_CRYPTO_SELF_TEST_COMPLETED = 210031; // 0x3346f

    field public static final int TAG_KEYGUARD_DISABLED_FEATURES_SET = 210021; // 0x33465

    field public static final int TAG_KEYGUARD_DISMISSED = 210006; // 0x33456

    field public static final int TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT = 210007; // 0x33457

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ package android { 
    field public static final java.lang.String BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE = "android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE";

    field public static final java.lang.String BIND_SETTINGS_SUGGESTIONS_SERVICE = "android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE";

    field public static final java.lang.String BIND_TELEPHONY_DATA_SERVICE = "android.permission.BIND_TELEPHONY_DATA_SERVICE";

    field public static final java.lang.String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";

    field public static final java.lang.String BIND_TELEPHONY_NETWORK_SERVICE = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";

    field public static final java.lang.String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";

    field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";

    field public static final java.lang.String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";

    field public static final java.lang.String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";

core/java/android/app/admin/SecurityLog.java

+10 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ public class SecurityLog { 
            TAG_KEY_DESTRUCTION,

            TAG_CERT_AUTHORITY_INSTALLED,

            TAG_CERT_AUTHORITY_REMOVED,

            TAG_CRYPTO_SELF_TEST_COMPLETED,

    })

    public @interface SecurityLogTag {}
@@ -399,6 +400,14 @@ public class SecurityLog { 
    public static final int TAG_USER_RESTRICTION_REMOVED =

            SecurityLogTags.SECURITY_USER_RESTRICTION_REMOVED;



    /**

     * Indicates that cryptographic functionality self test has completed. The log entry contains an

     * {@code Integer} payload, indicating the result of the test (0 if the test failed, 1 if

     * succeeded) and accessible via {@link SecurityEvent#getData()}.

     */

    public static final int TAG_CRYPTO_SELF_TEST_COMPLETED =

            SecurityLogTags.SECURITY_CRYPTO_SELF_TEST_COMPLETED;



    /**

     * Event severity level indicating that the event corresponds to normal workflow.

     */
@@ -529,6 +538,7 @@ public class SecurityLog { 
                case TAG_USER_RESTRICTION_REMOVED:

                    return LEVEL_INFO;

                case TAG_CERT_AUTHORITY_REMOVED:

                case TAG_CRYPTO_SELF_TEST_COMPLETED:

                    return getSuccess() ? LEVEL_INFO : LEVEL_ERROR;

                case TAG_CERT_AUTHORITY_INSTALLED:

                case TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT:

core/java/android/app/admin/SecurityLogTags.logtags

+2 −1
Original line number Diff line number Diff line
@@ -35,3 +35,4 @@ option java_package android.app.admin 
210028 security_user_restriction_removed        (package|3),(admin_user|1),(restriction|3)

210029 security_cert_authority_installed        (success|1),(subject|3)

210030 security_cert_authority_removed          (success|1),(subject|3)

210031 security_crypto_self_test_completed      (success|1)
 
 No newline at end of file

services/core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ cc_library_static { 
        "com_android_server_connectivity_Vpn.cpp",

        "com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp",

        "com_android_server_ConsumerIrService.cpp",

        "com_android_server_devicepolicy_CryptoTestHelper.cpp",

        "com_android_server_HardwarePropertiesManagerService.cpp",

        "com_android_server_hdmi_HdmiCecController.cpp",

        "com_android_server_input_InputApplicationHandle.cpp",