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/aidl_manager.cpp b/wpa_supplicant/aidl/aidl_manager.cpp
index 063d400..9277c40 100644
--- a/wpa_supplicant/aidl/aidl_manager.cpp
+++ b/wpa_supplicant/aidl/aidl_manager.cpp
@@ -2209,6 +2209,21 @@
}
/**
+ * Store the |INonStandardCertCallback| aidl object reference.
+ *
+ * @param callback Aidl reference of the |INonStandardCertCallback| object.
+ *
+ * @return 0 on success, 1 on failure.
+ */
+int AidlManager::registerNonStandardCertCallbackAidlObject(
+ const std::shared_ptr<INonStandardCertCallback> &callback)
+{
+ if (callback == nullptr) return 1;
+ non_standard_cert_callback_ = callback;
+ return 0;
+}
+
+/**
* Add a new iface callback aidl object reference to our
* interface callback list.
*
@@ -2560,6 +2575,28 @@
std::placeholders::_1, wpa_s->dscp_req_dialog_token, qosPolicyData));
}
+ssize_t AidlManager::getCertificate(const char* alias, uint8_t** value) {
+ if (alias == nullptr) {
+ wpa_printf(MSG_ERROR, "Cannot pass a null alias string to the callback");
+ return -1;
+ } else if (non_standard_cert_callback_ == nullptr) {
+ wpa_printf(MSG_ERROR, "NonStandardCertCallback has not been registered");
+ return -1;
+ }
+
+ std::vector<uint8_t> blob;
+ const auto& status =
+ non_standard_cert_callback_->getBlob(misc_utils::charBufToString(alias), &blob);
+ if (!status.isOk()) {
+ wpa_printf(MSG_ERROR, "Cert callback error, code=%d",
+ status.getServiceSpecificError());
+ return -1;
+ }
+
+ *value = blob.data();
+ return blob.size();
+}
+
} // namespace supplicant
} // namespace wifi
} // namespace hardware
diff --git a/wpa_supplicant/aidl/aidl_manager.h b/wpa_supplicant/aidl/aidl_manager.h
index 5224ef2..11fa26d 100644
--- a/wpa_supplicant/aidl/aidl_manager.h
+++ b/wpa_supplicant/aidl/aidl_manager.h
@@ -162,6 +162,7 @@
void notifyQosPolicyRequest(struct wpa_supplicant *wpa_s,
struct dscp_policy_data *policies,
int num_policies);
+ ssize_t getCertificate(const char* alias, uint8_t** value);
// Methods called from aidl objects.
void notifyExtRadioWorkStart(struct wpa_supplicant *wpa_s, uint32_t id);
@@ -191,6 +192,8 @@
int addStaNetworkCallbackAidlObject(
const std::string &ifname, int network_id,
const std::shared_ptr<ISupplicantStaNetworkCallback> &callback);
+ int registerNonStandardCertCallbackAidlObject(
+ const std::shared_ptr<INonStandardCertCallback> &callback);
private:
AidlManager() = default;
@@ -278,6 +281,8 @@
const std::string,
std::vector<std::shared_ptr<ISupplicantStaNetworkCallback>>>
sta_network_callbacks_map_;
+ // NonStandardCertCallback registered by the client.
+ std::shared_ptr<INonStandardCertCallback> non_standard_cert_callback_;
};
// The aidl interface uses some values which are the same as internal ones to
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)
{
diff --git a/wpa_supplicant/aidl/supplicant.h b/wpa_supplicant/aidl/supplicant.h
index cbe9a67..12b9299 100644
--- a/wpa_supplicant/aidl/supplicant.h
+++ b/wpa_supplicant/aidl/supplicant.h
@@ -64,6 +64,8 @@
std::vector<IfaceInfo>* _aidl_return) override;
::ndk::ScopedAStatus registerCallback(
const std::shared_ptr<ISupplicantCallback>& in_callback) override;
+ ::ndk::ScopedAStatus registerNonStandardCertCallback(
+ const std::shared_ptr<INonStandardCertCallback>& in_callback) override;
::ndk::ScopedAStatus setDebugParams(
DebugLevel in_level, bool in_showTimestamp, bool in_showKeys) override;
::ndk::ScopedAStatus getDebugLevel(DebugLevel* _aidl_return) override;
@@ -82,11 +84,13 @@
getP2pInterfaceInternal(const std::string& name);
std::pair<std::shared_ptr<ISupplicantStaIface>, ndk::ScopedAStatus>
getStaInterfaceInternal(const std::string& name);
-
+
ndk::ScopedAStatus removeInterfaceInternal(const IfaceInfo& iface_info);
std::pair<std::vector<IfaceInfo>, ndk::ScopedAStatus> listInterfacesInternal();
ndk::ScopedAStatus registerCallbackInternal(
const std::shared_ptr<ISupplicantCallback>& callback);
+ ndk::ScopedAStatus registerNonStandardCertCallbackInternal(
+ const std::shared_ptr<INonStandardCertCallback>& callback);
ndk::ScopedAStatus setDebugParamsInternal(
DebugLevel level, bool show_timestamp, bool show_keys);
ndk::ScopedAStatus setConcurrencyPriorityInternal(IfaceType type);