remove kSecAttrService

This commit is contained in:
eugenyorbitsoftcom 2022-08-03 10:52:59 +06:00
parent 18c0aa5c81
commit 06682c333f

View file

@ -35,14 +35,10 @@ void MobileUtils::shareText(const QStringList& filesToSend) {
} }
} }
const QString service = "org.amnezia.AmneziaVPN";
bool deleteFromKeychain(const QString& tag) { bool deleteFromKeychain(const QString& tag) {
NSData* nsTag = [tag.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; NSData* nsTag = [tag.toNSString() dataUsingEncoding:NSUTF8StringEncoding];
NSData* nsService = [service.toNSString() dataUsingEncoding:NSUTF8StringEncoding];
NSDictionary *deleteQuery = @{ (id)kSecAttrService: nsService, NSDictionary *deleteQuery = @{ (id)kSecAttrAccount: nsTag,
(id)kSecAttrAccount: nsTag,
(id)kSecClass: (id)kSecClassGenericPassword, (id)kSecClass: (id)kSecClassGenericPassword,
}; };
@ -60,11 +56,9 @@ void MobileUtils::writeToKeychain(const QString& tag, const QString& value) {
deleteFromKeychain(tag); deleteFromKeychain(tag);
NSData* nsTag = [tag.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; NSData* nsTag = [tag.toNSString() dataUsingEncoding:NSUTF8StringEncoding];
NSData* nsService = [service.toNSString() dataUsingEncoding:NSUTF8StringEncoding];
NSData* nsValue = [value.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; NSData* nsValue = [value.toNSString() dataUsingEncoding:NSUTF8StringEncoding];
NSDictionary* addQuery = @{ (id)kSecAttrService: nsService, NSDictionary* addQuery = @{ (id)kSecAttrAccount: nsTag,
(id)kSecAttrAccount: nsTag,
(id)kSecClass: (id)kSecClassGenericPassword, (id)kSecClass: (id)kSecClassGenericPassword,
(id)kSecValueData: nsValue, (id)kSecValueData: nsValue,
}; };
@ -79,11 +73,9 @@ void MobileUtils::writeToKeychain(const QString& tag, const QString& value) {
QString MobileUtils::readFromKeychain(const QString& tag) { QString MobileUtils::readFromKeychain(const QString& tag) {
NSData* nsTag = [tag.toNSString() dataUsingEncoding:NSUTF8StringEncoding]; NSData* nsTag = [tag.toNSString() dataUsingEncoding:NSUTF8StringEncoding];
NSData* nsService = [service.toNSString() dataUsingEncoding:NSUTF8StringEncoding];
NSData* nsValue = NULL; NSData* nsValue = NULL;
NSDictionary *getQuery = @{ (id)kSecAttrService: nsService, NSDictionary *getQuery = @{ (id)kSecAttrAccount: nsTag,
(id)kSecAttrAccount: nsTag,
(id)kSecClass: (id)kSecClassGenericPassword, (id)kSecClass: (id)kSecClassGenericPassword,
(id)kSecMatchLimit: (id)kSecMatchLimitOne, (id)kSecMatchLimit: (id)kSecMatchLimitOne,
(id)kSecReturnData: @YES, (id)kSecReturnData: @YES,