diff options
| author | Roshan Pius <rpius@google.com> | 2019-10-22 15:37:41 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2019-11-14 11:18:28 -0800 |
| commit | 6237115f3c6ae723eb3927640c843714793fbe59 (patch) | |
| tree | fb37f3972b128ab1bc399e0e4854050681e62173 /service/java/com/android/server/wifi/WifiConfigStore.java | |
| parent | a161d62d9baac95a087cb3252d51c1fd101d24fa (diff) | |
| download | android_frameworks_opt_net_wifi-6237115f3c6ae723eb3927640c843714793fbe59.tar.gz android_frameworks_opt_net_wifi-6237115f3c6ae723eb3927640c843714793fbe59.tar.bz2 android_frameworks_opt_net_wifi-6237115f3c6ae723eb3927640c843714793fbe59.zip | |
WifiConfigStore: Encrypt credentials for networks (2/4)
Plumb the EncryptionUtil & version info to the XmlUtil classes that
actually handle the serialization/deserialization of data.
Also, created a helper class to serialize/deserialize EncryptedData
class.
Bug: 140485110
Test: atest com.android.server.wifi
Change-Id: I92846f1fb63f3b85892750b195a535bcfdc03e2c
Merged-In: I92846f1fb63f3b85892750b195a535bcfdc03e2c
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigStore.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigStore.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java index efe4a4c8d..dee52a795 100644 --- a/service/java/com/android/server/wifi/WifiConfigStore.java +++ b/service/java/com/android/server/wifi/WifiConfigStore.java @@ -100,8 +100,6 @@ public class WifiConfigStore { private static final String XML_TAG_DOCUMENT_HEADER = "WifiConfigStoreData"; private static final String XML_TAG_VERSION = "Version"; private static final String XML_TAG_HEADER_INTEGRITY = "Integrity"; - private static final String XML_TAG_INTEGRITY_ENCRYPTED_DATA = "EncryptedData"; - private static final String XML_TAG_INTEGRITY_IV = "IV"; /** * Current config store data version. This will be incremented for any additions. */ @@ -669,8 +667,7 @@ public class WifiConfigStore { private static void parseAndDiscardIntegrityDataFromXml(XmlPullParser in, int outerTagDepth) throws XmlPullParserException, IOException { XmlUtil.gotoNextSectionWithName(in, XML_TAG_HEADER_INTEGRITY, outerTagDepth); - XmlUtil.readNextValueWithName(in, XML_TAG_INTEGRITY_ENCRYPTED_DATA); - XmlUtil.readNextValueWithName(in, XML_TAG_INTEGRITY_IV); + XmlUtil.EncryptedDataXmlUtil.parseFromXml(in, outerTagDepth + 1); } /** |