From 06682c333f3dd512b3afa3b5340fa79dabf54dc2 Mon Sep 17 00:00:00 2001 From: eugenyorbitsoftcom Date: Wed, 3 Aug 2022 10:52:59 +0600 Subject: [PATCH] remove kSecAttrService --- client/platforms/ios/MobileUtils.mm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/client/platforms/ios/MobileUtils.mm b/client/platforms/ios/MobileUtils.mm index 38f06a6c..4a2e43e6 100644 --- a/client/platforms/ios/MobileUtils.mm +++ b/client/platforms/ios/MobileUtils.mm @@ -35,14 +35,10 @@ void MobileUtils::shareText(const QStringList& filesToSend) { } } -const QString service = "org.amnezia.AmneziaVPN"; - bool deleteFromKeychain(const QString& tag) { NSData* nsTag = [tag.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; - NSData* nsService = [service.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; - NSDictionary *deleteQuery = @{ (id)kSecAttrService: nsService, - (id)kSecAttrAccount: nsTag, + NSDictionary *deleteQuery = @{ (id)kSecAttrAccount: nsTag, (id)kSecClass: (id)kSecClassGenericPassword, }; @@ -60,11 +56,9 @@ void MobileUtils::writeToKeychain(const QString& tag, const QString& value) { deleteFromKeychain(tag); NSData* nsTag = [tag.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; - NSData* nsService = [service.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; NSData* nsValue = [value.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; - NSDictionary* addQuery = @{ (id)kSecAttrService: nsService, - (id)kSecAttrAccount: nsTag, + NSDictionary* addQuery = @{ (id)kSecAttrAccount: nsTag, (id)kSecClass: (id)kSecClassGenericPassword, (id)kSecValueData: nsValue, }; @@ -79,11 +73,9 @@ void MobileUtils::writeToKeychain(const QString& tag, const QString& value) { QString MobileUtils::readFromKeychain(const QString& tag) { NSData* nsTag = [tag.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; - NSData* nsService = [service.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; NSData* nsValue = NULL; - NSDictionary *getQuery = @{ (id)kSecAttrService: nsService, - (id)kSecAttrAccount: nsTag, + NSDictionary *getQuery = @{ (id)kSecAttrAccount: nsTag, (id)kSecClass: (id)kSecClassGenericPassword, (id)kSecMatchLimit: (id)kSecMatchLimitOne, (id)kSecReturnData: @YES,