Add non-standard certicate methods to supplicant.
registerNonStandardCertCallback() allows the framework
to register an INonStandardCertCallback object.
getCertificate() allows callers within
supplicant to retrieve certificates. The current
implementation always retrieves from the framework,
but we will add the ability to get Keystore2
certificates in a later CL.
Bug: 205764502
Test: Manual test - store a key-value pair to
legacy Keystore. Check that we can retrieve
the value in supplicant using the new callback.
Change-Id: I440e2d612f36b94efd55bd620cb04387c5493c1d
diff --git a/wpa_supplicant/aidl/supplicant.cpp b/wpa_supplicant/aidl/supplicant.cpp
index 799790b..74602e4 100644
--- a/wpa_supplicant/aidl/supplicant.cpp
+++ b/wpa_supplicant/aidl/supplicant.cpp
@@ -239,6 +239,14 @@
&Supplicant::registerCallbackInternal, in_callback);
}
+::ndk::ScopedAStatus Supplicant::registerNonStandardCertCallback(
+ const std::shared_ptr<INonStandardCertCallback>& in_callback)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_IFACE_INVALID,
+ &Supplicant::registerNonStandardCertCallbackInternal, in_callback);
+}
+
::ndk::ScopedAStatus Supplicant::setDebugParams(
DebugLevel in_level, bool in_showTimestamp,
bool in_showKeys)
@@ -547,6 +555,17 @@
return ndk::ScopedAStatus::ok();
}
+ndk::ScopedAStatus Supplicant::registerNonStandardCertCallbackInternal(
+ const std::shared_ptr<INonStandardCertCallback>& callback)
+{
+ AidlManager* aidl_manager = AidlManager::getInstance();
+ if (!aidl_manager ||
+ aidl_manager->registerNonStandardCertCallbackAidlObject(callback)) {
+ return createStatus(SupplicantStatusCode::FAILURE_UNKNOWN);
+ }
+ return ndk::ScopedAStatus::ok();
+}
+
ndk::ScopedAStatus Supplicant::setDebugParamsInternal(
DebugLevel level, bool show_timestamp, bool show_keys)
{