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

Commit 2d0a5dc6 authored by Jimmy Chen's avatar Jimmy Chen Committed by Android (Google) Code Review
Browse files

Merge "wifi: add certificate HAL callback for Trust On First Use support"

parents efbebcdf faeb1330

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaNetworkCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -38,4 +38,5 @@ interface ISupplicantStaNetworkCallback { 
  oneway void onNetworkEapSimGsmAuthRequest(in android.hardware.wifi.supplicant.NetworkRequestEapSimGsmAuthParams params);

  oneway void onNetworkEapSimUmtsAuthRequest(in android.hardware.wifi.supplicant.NetworkRequestEapSimUmtsAuthParams params);

  oneway void onTransitionDisable(in android.hardware.wifi.supplicant.TransitionDisableIndication ind);

  oneway void onServerCertificateAvailable(in int depth, in byte[] subject, in byte[] certHash, in byte[] certBlob);

}

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/WpaDriverCapabilitiesMask.aidl

+1 −0
Original line number Diff line number Diff line
@@ -38,4 +38,5 @@ enum WpaDriverCapabilitiesMask { 
  OCE = 2,

  SAE_PK = 4,

  WFD_R2 = 8,

  TRUST_ON_FIRST_USE = 16,

}

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaNetworkCallback.aidl

+9 −0
Original line number Diff line number Diff line
@@ -62,4 +62,13 @@ interface ISupplicantStaNetworkCallback { 
     * Used to notify WPA3 transition disable.

     */

    oneway void onTransitionDisable(in TransitionDisableIndication ind);



    /**

     * Used to notify EAP certificate event.

     *

     * On receiving a server certifidate from TLS handshake, send this certificate

     * to the framework for Trust On First Use.

     */

    oneway void onServerCertificateAvailable(

            in int depth, in byte[] subject, in byte[] certHash, in byte[] certBlob);

}

wifi/supplicant/aidl/android/hardware/wifi/supplicant/WpaDriverCapabilitiesMask.aidl

+4 −0
Original line number Diff line number Diff line
@@ -38,4 +38,8 @@ enum WpaDriverCapabilitiesMask { 
     * Wi-Fi Display R2

     */

    WFD_R2 = 1 << 3,

    /**

     * Trust On First Use

     */

    TRUST_ON_FIRST_USE = 1 << 4,

}

wifi/supplicant/aidl/vts/functional/supplicant_sta_network_aidl_test.cpp

+6 −0
Original line number Diff line number Diff line
@@ -92,6 +92,12 @@ class SupplicantStaNetworkCallback : public BnSupplicantStaNetworkCallback { 
        TransitionDisableIndication /* ind */) override {

        return ndk::ScopedAStatus::ok();

    }

    ::ndk::ScopedAStatus onServerCertificateAvailable(

            int32_t /* depth */, const std::vector<uint8_t>& /* subject */,

            const std::vector<uint8_t>& /* certHash */,

            const std::vector<uint8_t>& /* certBlob */) override {

        return ndk::ScopedAStatus::ok();

    }

};



class SupplicantStaNetworkAidlTest