commit a5bdf3779d57d64fb1ea70023d1c49e5dc2fe123
author Gabriel Biren <gbiren@google.com> Thu Dec 15 20:54:33 2022 +0000
committer Gabriel Biren <gbiren@google.com> Tue Dec 20 01:01:36 2022 +0000
tree 7e5f028df2e372d115429a5424fa55fcc4b00c9b
parent 933982327f6642e718f974cc1a14abe92823f42a

Replace call into Wifi Keystore with a
call into the new get_certificate method.

Bug: 205764502
Test: Manual test - connect to a WPA Enterprise network.
      Tests that KS2 path is still working.

      Manual test - store a key-value pair to
      legacy Keystore. Check that we can retrieve
      the value in supplicant. Tests the legacy
      keystore path.

      Manual test - try to retrieve a non-existing
      value from legacy keystore. Check that the
      get_certificate method returns -1

Change-Id: I5b595b6592ca9298a2cb667bc38edd4bd2d1e8e6

wpa_supplicant/Android.bp

diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index 7db0ef3..be79765 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -75,7 +75,6 @@
         "libcrypto",
         "libcutils",
         "libkeystore-engine-wifi-hidl",
-        "libkeystore-wifi-hidl",
         "liblog",
         "libnl",
         "libssl",

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 2b798fa..33dabf3 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1791,7 +1791,7 @@
 LOCAL_SHARED_LIBRARIES += $(LIB_SHARED_EAP_PROXY)
 endif
 ifeq ($(CONFIG_TLS), openssl)
-LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore-wifi-hidl
+LOCAL_SHARED_LIBRARIES += libcrypto libssl
 endif
 
 # With BoringSSL we need libkeystore-engine in order to provide access to