mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2026-04-07 05:45:53 +00:00
Fixes
fix localeWithStrings globally (#30)
Fix badge on zoomed devices. closes #9
Hide channel bottom panel closes #27
Another attempt to fix badge on some Zoomed devices
Force System Share sheet tg://sg/debug
fixes for device badge
New Crowdin updates (#34)
* New translations sglocalizable.strings (Chinese Traditional)
* New translations sglocalizable.strings (Chinese Simplified)
* New translations sglocalizable.strings (Chinese Traditional)
Fix input panel hidden on selection (#31)
* added if check for selectionState != nil
* same order of subnodes
Revert "Fix input panel hidden on selection (#31)"
This reverts commit e8a8bb1496.
Fix input panel for channels Closes #37
Quickly share links with system's share menu
force tabbar when editing
increase height for correct animation
New translations sglocalizable.strings (Ukrainian) (#38)
Hide Post Story button
Fix 10.15.1
Fix archive option for long-tap
Enable in-app Safari
Disable some unsupported purchases
disableDeleteChatSwipeOption + refactor restart alert
Hide bot in suggestions list
Fix merge v11.0
Fix exceptions for safari webview controller
New Crowdin updates (#47)
* New translations sglocalizable.strings (Romanian)
* New translations sglocalizable.strings (French)
* New translations sglocalizable.strings (Spanish)
* New translations sglocalizable.strings (Afrikaans)
* New translations sglocalizable.strings (Arabic)
* New translations sglocalizable.strings (Catalan)
* New translations sglocalizable.strings (Czech)
* New translations sglocalizable.strings (Danish)
* New translations sglocalizable.strings (German)
* New translations sglocalizable.strings (Greek)
* New translations sglocalizable.strings (Finnish)
* New translations sglocalizable.strings (Hebrew)
* New translations sglocalizable.strings (Hungarian)
* New translations sglocalizable.strings (Italian)
* New translations sglocalizable.strings (Japanese)
* New translations sglocalizable.strings (Korean)
* New translations sglocalizable.strings (Dutch)
* New translations sglocalizable.strings (Norwegian)
* New translations sglocalizable.strings (Polish)
* New translations sglocalizable.strings (Portuguese)
* New translations sglocalizable.strings (Serbian (Cyrillic))
* New translations sglocalizable.strings (Swedish)
* New translations sglocalizable.strings (Turkish)
* New translations sglocalizable.strings (Vietnamese)
* New translations sglocalizable.strings (Indonesian)
* New translations sglocalizable.strings (Hindi)
* New translations sglocalizable.strings (Uzbek)
New Crowdin updates (#49)
* New translations sglocalizable.strings (Arabic)
* New translations sglocalizable.strings (Arabic)
New translations sglocalizable.strings (Russian) (#51)
Call confirmation
WIP Settings search
Settings Search
Localize placeholder
Update AccountUtils.swift
mark mutual contact
Align back context action to left
New Crowdin updates (#54)
* New translations sglocalizable.strings (Chinese Simplified)
* New translations sglocalizable.strings (Chinese Traditional)
* New translations sglocalizable.strings (Ukrainian)
Independent Playground app for simulator
New translations sglocalizable.strings (Ukrainian) (#55)
Playground UIKit base and controllers
Inject SwiftUI view with overflow to AsyncDisplayKit
Launch Playgound project on simulator
Create .swiftformat
Move Playground to example
Update .swiftformat
Init SwiftUIViewController
wip
New translations sglocalizable.strings (Chinese Traditional) (#57)
Xcode 16 fixes
Fix
New translations sglocalizable.strings (Italian) (#59)
New translations sglocalizable.strings (Chinese Simplified) (#63)
Force disable CallKit integration due to missing NSE Entitlement
Fix merge
Fix whole chat translator
Sweetpad config
Bump version
11.3.1 fixes
Mutual contact placement fix
Disable Video PIP swipe
Update versions.json
Fix PIP crash
503 lines
18 KiB
Objective-C
503 lines
18 KiB
Objective-C
#import <BuildConfig/BuildConfig.h>
|
|
|
|
static NSString *telegramApplicationSecretKey = @"telegramApplicationSecretKey_v3";
|
|
API_AVAILABLE(ios(10))
|
|
@interface LocalPrivateKey : NSObject {
|
|
SecKeyRef _privateKey;
|
|
SecKeyRef _publicKey;
|
|
}
|
|
|
|
- (NSData * _Nullable)encrypt:(NSData * _Nonnull)data;
|
|
- (NSData * _Nullable)decrypt:(NSData * _Nonnull)data cancelled:(bool *)cancelled;
|
|
|
|
@end
|
|
|
|
@implementation LocalPrivateKey
|
|
|
|
- (instancetype _Nonnull)initWithPrivateKey:(SecKeyRef)privateKey publicKey:(SecKeyRef)publicKey {
|
|
self = [super init];
|
|
if (self != nil) {
|
|
_privateKey = (SecKeyRef)CFRetain(privateKey);
|
|
_publicKey = (SecKeyRef)CFRetain(publicKey);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)dealloc {
|
|
CFRelease(_privateKey);
|
|
CFRelease(_publicKey);
|
|
}
|
|
|
|
- (NSData * _Nullable)getPublicKey {
|
|
NSData *result = CFBridgingRelease(SecKeyCopyExternalRepresentation(_publicKey, nil));
|
|
return result;
|
|
}
|
|
|
|
- (NSData * _Nullable)encrypt:(NSData * _Nonnull)data {
|
|
if (data.length % 16 != 0) {
|
|
return nil;
|
|
}
|
|
|
|
CFErrorRef error = NULL;
|
|
NSData *cipherText = (NSData *)CFBridgingRelease(SecKeyCreateEncryptedData(_publicKey, kSecKeyAlgorithmECIESEncryptionCofactorX963SHA256AESGCM, (__bridge CFDataRef)data, &error));
|
|
|
|
if (!cipherText) {
|
|
__unused NSError *err = CFBridgingRelease(error);
|
|
return nil;
|
|
}
|
|
|
|
return cipherText;
|
|
}
|
|
|
|
- (NSData * _Nullable)decrypt:(NSData * _Nonnull)data cancelled:(bool *)cancelled {
|
|
CFErrorRef error = NULL;
|
|
NSData *plainText = (NSData *)CFBridgingRelease(SecKeyCreateDecryptedData(_privateKey, kSecKeyAlgorithmECIESEncryptionCofactorX963SHA256AESGCM, (__bridge CFDataRef)data, &error));
|
|
|
|
if (!plainText) {
|
|
__unused NSError *err = CFBridgingRelease(error);
|
|
if (err.code == -2) {
|
|
if (cancelled) {
|
|
*cancelled = true;
|
|
}
|
|
}
|
|
return nil;
|
|
}
|
|
|
|
return plainText;
|
|
}
|
|
|
|
@end
|
|
|
|
@interface BuildConfig () {
|
|
NSData * _Nullable _bundleData;
|
|
NSString * _Nonnull _sgConfig;
|
|
int32_t _apiId;
|
|
NSString * _Nonnull _apiHash;
|
|
NSString * _Nullable _appCenterId;
|
|
NSMutableDictionary * _Nonnull _dataDict;
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation DeviceSpecificEncryptionParameters
|
|
|
|
- (instancetype)initWithKey:(NSData * _Nonnull)key salt:(NSData * _Nonnull)salt {
|
|
self = [super init];
|
|
if (self != nil) {
|
|
_key = key;
|
|
_salt = salt;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation BuildConfig
|
|
|
|
+ (NSString *)bundleId {
|
|
NSDictionary *query = [NSDictionary dictionaryWithObjectsAndKeys:
|
|
(__bridge NSString *)kSecClassGenericPassword, (__bridge NSString *)kSecClass,
|
|
@"bundleSeedID", kSecAttrAccount,
|
|
@"", kSecAttrService,
|
|
(id)kCFBooleanTrue, kSecReturnAttributes,
|
|
nil];
|
|
CFDictionaryRef result = nil;
|
|
OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)query, (CFTypeRef *)&result);
|
|
if (status == errSecItemNotFound) {
|
|
status = SecItemAdd((__bridge CFDictionaryRef)query, (CFTypeRef *)&result);
|
|
}
|
|
if (status != errSecSuccess) {
|
|
return nil;
|
|
}
|
|
NSString *accessGroup = [(__bridge NSDictionary *)result objectForKey:(__bridge NSString *)kSecAttrAccessGroup];
|
|
NSArray *components = [accessGroup componentsSeparatedByString:@"."];
|
|
NSString *bundleSeedID = [[components objectEnumerator] nextObject];
|
|
CFRelease(result);
|
|
return bundleSeedID;
|
|
}
|
|
|
|
+ (instancetype _Nonnull)sharedBuildConfig {
|
|
static BuildConfig *instance = nil;
|
|
static dispatch_once_t onceToken;
|
|
dispatch_once(&onceToken, ^{
|
|
instance = [[BuildConfig alloc] init];
|
|
});
|
|
return instance;
|
|
}
|
|
|
|
- (instancetype _Nonnull)initWithBaseAppBundleId:(NSString * _Nonnull)baseAppBundleId {
|
|
self = [super init];
|
|
if (self != nil) {
|
|
_sgConfig = @(APP_SG_CONFIG);
|
|
_apiId = APP_CONFIG_API_ID;
|
|
_apiHash = @(APP_CONFIG_API_HASH);
|
|
_appCenterId = @(APP_CONFIG_APP_CENTER_ID);
|
|
|
|
_dataDict = [[NSMutableDictionary alloc] init];
|
|
|
|
if (baseAppBundleId != nil) {
|
|
_dataDict[@"bundleId"] = baseAppBundleId;
|
|
}
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (NSData * _Nullable)bundleDataWithAppToken:(NSData * _Nullable)appToken tokenType:(NSString * _Nullable)tokenType tokenEnvironment:(NSString * _Nullable)tokenEnvironment signatureDict:(NSDictionary * _Nullable)signatureDict {
|
|
NSMutableDictionary *dataDict = [[NSMutableDictionary alloc] initWithDictionary:_dataDict];
|
|
if (appToken != nil) {
|
|
dataDict[@"device_token"] = [appToken base64EncodedStringWithOptions:0];
|
|
if (tokenType != nil) {
|
|
dataDict[@"device_token_type"] = tokenType;
|
|
}
|
|
if (tokenEnvironment != nil) {
|
|
dataDict[@"device_token_environment"] = tokenEnvironment;
|
|
}
|
|
}
|
|
float tzOffset = [[NSTimeZone systemTimeZone] secondsFromGMT];
|
|
dataDict[@"tz_offset"] = @((int)tzOffset);
|
|
if (signatureDict != nil) {
|
|
for (id<NSCopying> key in signatureDict.allKeys) {
|
|
dataDict[key] = signatureDict[key];
|
|
}
|
|
}
|
|
NSData *data = [NSJSONSerialization dataWithJSONObject:dataDict options:0 error:nil];
|
|
return data;
|
|
}
|
|
|
|
- (int32_t)apiId {
|
|
return _apiId;
|
|
}
|
|
|
|
- (NSString * _Nonnull)apiHash {
|
|
return _apiHash;
|
|
}
|
|
|
|
- (NSString * _Nullable)appCenterId {
|
|
return _appCenterId;
|
|
}
|
|
|
|
- (bool)isInternalBuild {
|
|
return APP_CONFIG_IS_INTERNAL_BUILD;
|
|
}
|
|
|
|
- (bool)isAppStoreBuild {
|
|
return APP_CONFIG_IS_APPSTORE_BUILD;
|
|
}
|
|
|
|
- (int64_t)appStoreId {
|
|
return APP_CONFIG_APPSTORE_ID;
|
|
}
|
|
|
|
- (NSString *)appSpecificUrlScheme {
|
|
return @(APP_SPECIFIC_URL_SCHEME);
|
|
}
|
|
|
|
- (bool)isICloudEnabled {
|
|
return APP_CONFIG_IS_ICLOUD_ENABLED;
|
|
}
|
|
|
|
- (bool)isSiriEnabled {
|
|
return APP_CONFIG_IS_SIRI_ENABLED;
|
|
}
|
|
|
|
+ (NSString * _Nullable)bundleSeedId {
|
|
NSDictionary *query = [NSDictionary dictionaryWithObjectsAndKeys:
|
|
(__bridge NSString *)kSecClassGenericPassword, (__bridge NSString *)kSecClass,
|
|
@"bundleSeedID", kSecAttrAccount,
|
|
@"", kSecAttrService,
|
|
(id)kCFBooleanTrue, kSecReturnAttributes,
|
|
nil];
|
|
CFDictionaryRef result = nil;
|
|
OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)query, (CFTypeRef *)&result);
|
|
if (status == errSecItemNotFound) {
|
|
status = SecItemAdd((__bridge CFDictionaryRef)query, (CFTypeRef *)&result);
|
|
}
|
|
if (status != errSecSuccess) {
|
|
return nil;
|
|
}
|
|
NSString *accessGroup = [(__bridge NSDictionary *)result objectForKey:(__bridge NSString *)kSecAttrAccessGroup];
|
|
NSArray *components = [accessGroup componentsSeparatedByString:@"."];
|
|
NSString *bundleSeedID = [[components objectEnumerator] nextObject];
|
|
CFRelease(result);
|
|
return bundleSeedID;
|
|
}
|
|
|
|
+ (NSData * _Nullable)applicationSecretTag:(bool)isCheckKey {
|
|
if (isCheckKey) {
|
|
return [[telegramApplicationSecretKey stringByAppendingString:@"_check"] dataUsingEncoding:NSUTF8StringEncoding];
|
|
} else {
|
|
return [telegramApplicationSecretKey dataUsingEncoding:NSUTF8StringEncoding];
|
|
}
|
|
}
|
|
|
|
+ (LocalPrivateKey * _Nullable)getApplicationSecretKey:(NSString * _Nonnull)baseAppBundleId isCheckKey:(bool)isCheckKey API_AVAILABLE(ios(10)) {
|
|
NSString *bundleSeedId = [self bundleSeedId];
|
|
if (bundleSeedId == nil) {
|
|
return nil;
|
|
}
|
|
|
|
NSData *applicationTag = [self applicationSecretTag:isCheckKey];
|
|
NSString *accessGroup = [bundleSeedId stringByAppendingFormat:@".%@", baseAppBundleId];
|
|
|
|
NSDictionary *query = @{
|
|
(id)kSecClass: (id)kSecClassKey,
|
|
(id)kSecAttrApplicationTag: applicationTag,
|
|
(id)kSecAttrKeyType: (id)kSecAttrKeyTypeECSECPrimeRandom,
|
|
(id)kSecAttrAccessGroup: (id)accessGroup,
|
|
(id)kSecReturnRef: @YES
|
|
};
|
|
SecKeyRef privateKey = NULL;
|
|
OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)query, (CFTypeRef *)&privateKey);
|
|
if (status != errSecSuccess) {
|
|
return nil;
|
|
}
|
|
|
|
SecKeyRef publicKey = SecKeyCopyPublicKey(privateKey);
|
|
if (!publicKey) {
|
|
if (privateKey) {
|
|
CFRelease(privateKey);
|
|
}
|
|
return nil;
|
|
}
|
|
|
|
LocalPrivateKey *result = [[LocalPrivateKey alloc] initWithPrivateKey:privateKey publicKey:publicKey];
|
|
|
|
if (publicKey) {
|
|
CFRelease(publicKey);
|
|
}
|
|
if (privateKey) {
|
|
CFRelease(privateKey);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
+ (bool)removeApplicationSecretKey:(NSString * _Nonnull)baseAppBundleId isCheckKey:(bool)isCheckKey API_AVAILABLE(ios(10)) {
|
|
NSString *bundleSeedId = [self bundleSeedId];
|
|
if (bundleSeedId == nil) {
|
|
return nil;
|
|
}
|
|
|
|
NSData *applicationTag = [self applicationSecretTag:isCheckKey];
|
|
NSString *accessGroup = [bundleSeedId stringByAppendingFormat:@".%@", baseAppBundleId];
|
|
|
|
NSDictionary *query = @{
|
|
(id)kSecClass: (id)kSecClassKey,
|
|
(id)kSecAttrApplicationTag: applicationTag,
|
|
(id)kSecAttrKeyType: (id)kSecAttrKeyTypeECSECPrimeRandom,
|
|
(id)kSecAttrAccessGroup: (id)accessGroup
|
|
};
|
|
OSStatus status = SecItemDelete((__bridge CFDictionaryRef)query);
|
|
if (status != errSecSuccess) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
+ (LocalPrivateKey * _Nullable)addApplicationSecretKey:(NSString * _Nonnull)baseAppBundleId isCheckKey:(bool)isCheckKey API_AVAILABLE(ios(10)) {
|
|
NSString *bundleSeedId = [self bundleSeedId];
|
|
if (bundleSeedId == nil) {
|
|
return nil;
|
|
}
|
|
|
|
NSData *applicationTag = [self applicationSecretTag:isCheckKey];
|
|
NSString *accessGroup = [bundleSeedId stringByAppendingFormat:@".%@", baseAppBundleId];
|
|
|
|
SecAccessControlRef access;
|
|
if (isCheckKey) {
|
|
access = SecAccessControlCreateWithFlags(kCFAllocatorDefault, kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly, kSecAccessControlPrivateKeyUsage, NULL);
|
|
} else {
|
|
access = SecAccessControlCreateWithFlags(kCFAllocatorDefault, kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly, kSecAccessControlUserPresence | kSecAccessControlPrivateKeyUsage, NULL);
|
|
}
|
|
NSDictionary *attributes = @{
|
|
(id)kSecAttrKeyType: (id)kSecAttrKeyTypeECSECPrimeRandom,
|
|
(id)kSecAttrKeySizeInBits: @256,
|
|
(id)kSecAttrTokenID: (id)kSecAttrTokenIDSecureEnclave,
|
|
(id)kSecPrivateKeyAttrs: @{
|
|
(id)kSecAttrIsPermanent: @YES,
|
|
(id)kSecAttrApplicationTag: applicationTag,
|
|
(id)kSecAttrAccessControl: (__bridge id)access,
|
|
(id)kSecAttrAccessGroup: (id)accessGroup,
|
|
},
|
|
};
|
|
|
|
CFErrorRef error = NULL;
|
|
SecKeyRef privateKey = SecKeyCreateRandomKey((__bridge CFDictionaryRef)attributes, &error);
|
|
if (!privateKey) {
|
|
if (access) {
|
|
CFRelease(access);
|
|
}
|
|
|
|
__unused NSError *err = CFBridgingRelease(error);
|
|
return nil;
|
|
}
|
|
|
|
SecKeyRef publicKey = SecKeyCopyPublicKey(privateKey);
|
|
if (!publicKey) {
|
|
if (privateKey) {
|
|
CFRelease(privateKey);
|
|
}
|
|
if (access) {
|
|
CFRelease(access);
|
|
}
|
|
|
|
__unused NSError *err = CFBridgingRelease(error);
|
|
return nil;
|
|
}
|
|
|
|
LocalPrivateKey *result = [[LocalPrivateKey alloc] initWithPrivateKey:privateKey publicKey:publicKey];
|
|
|
|
if (publicKey) {
|
|
CFRelease(publicKey);
|
|
}
|
|
if (privateKey) {
|
|
CFRelease(privateKey);
|
|
}
|
|
if (access) {
|
|
CFRelease(access);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
+ (DeviceSpecificEncryptionParameters * _Nonnull)deviceSpecificEncryptionParameters:(NSString * _Nonnull)rootPath baseAppBundleId:(NSString * _Nonnull)baseAppBundleId {
|
|
CFAbsoluteTime startTime = CFAbsoluteTimeGetCurrent();
|
|
|
|
NSString *filePath = [rootPath stringByAppendingPathComponent:@".tempkey"];
|
|
//NSString *encryptedPath = [rootPath stringByAppendingPathComponent:@".tempkeyEncrypted"];
|
|
|
|
NSData *currentData = [NSData dataWithContentsOfFile:filePath];
|
|
NSData *resultData = nil;
|
|
if (currentData != nil && currentData.length == 32 + 16) {
|
|
resultData = currentData;
|
|
}
|
|
if (resultData == nil) {
|
|
NSMutableData *randomData = [[NSMutableData alloc] initWithLength:32 + 16];
|
|
int result = SecRandomCopyBytes(kSecRandomDefault, randomData.length, [randomData mutableBytes]);
|
|
if (currentData != nil && currentData.length == 32) { // upgrade key with salt
|
|
[currentData getBytes:randomData.mutableBytes length:32];
|
|
}
|
|
assert(result == 0);
|
|
resultData = randomData;
|
|
[resultData writeToFile:filePath atomically:false];
|
|
}
|
|
|
|
/*if (@available(iOS 11, *)) {
|
|
NSData *currentEncryptedData = [NSData dataWithContentsOfFile:encryptedPath];
|
|
|
|
LocalPrivateKey *localPrivateKey = [self getLocalPrivateKey:baseAppBundleId];
|
|
|
|
if (localPrivateKey == nil) {
|
|
localPrivateKey = [self addLocalPrivateKey:baseAppBundleId];
|
|
}
|
|
|
|
if (localPrivateKey != nil) {
|
|
if (currentEncryptedData != nil) {
|
|
NSData *decryptedData = [localPrivateKey decrypt:currentEncryptedData];
|
|
|
|
if (![resultData isEqualToData:decryptedData]) {
|
|
NSData *encryptedData = [localPrivateKey encrypt:resultData];
|
|
[encryptedData writeToFile:encryptedPath atomically:false];
|
|
//assert(false);
|
|
}
|
|
} else {
|
|
NSData *encryptedData = [localPrivateKey encrypt:resultData];
|
|
[encryptedData writeToFile:encryptedPath atomically:false];
|
|
}
|
|
}
|
|
}*/
|
|
|
|
CFAbsoluteTime endTime = CFAbsoluteTimeGetCurrent();
|
|
NSLog(@"deviceSpecificEncryptionParameters took %f ms", (endTime - startTime) * 1000.0);
|
|
|
|
NSData *key = [resultData subdataWithRange:NSMakeRange(0, 32)];
|
|
NSData *salt = [resultData subdataWithRange:NSMakeRange(32, 16)];
|
|
return [[DeviceSpecificEncryptionParameters alloc] initWithKey:key salt:salt];
|
|
}
|
|
|
|
+ (dispatch_queue_t)encryptionQueue {
|
|
static dispatch_queue_t instance = nil;
|
|
static dispatch_once_t onceToken;
|
|
dispatch_once(&onceToken, ^{
|
|
instance = dispatch_queue_create("encryptionQueue", 0);
|
|
});
|
|
return instance;
|
|
}
|
|
|
|
+ (void)getHardwareEncryptionAvailableWithBaseAppBundleId:(NSString * _Nonnull)baseAppBundleId completion:(void (^)(NSData * _Nullable))completion {
|
|
dispatch_async([self encryptionQueue], ^{
|
|
LocalPrivateKey *checkKey = [self getApplicationSecretKey:baseAppBundleId isCheckKey:true];
|
|
if (checkKey != nil) {
|
|
NSData *sampleData = [checkKey encrypt:[NSData data]];
|
|
if (sampleData == nil) {
|
|
[self removeApplicationSecretKey:baseAppBundleId isCheckKey:false];
|
|
[self removeApplicationSecretKey:baseAppBundleId isCheckKey:true];
|
|
} else {
|
|
NSData *decryptedData = [checkKey decrypt:sampleData cancelled: nil];
|
|
if (decryptedData == nil) {
|
|
[self removeApplicationSecretKey:baseAppBundleId isCheckKey:false];
|
|
[self removeApplicationSecretKey:baseAppBundleId isCheckKey:true];
|
|
}
|
|
}
|
|
} else {
|
|
[self removeApplicationSecretKey:baseAppBundleId isCheckKey:false];
|
|
[self removeApplicationSecretKey:baseAppBundleId isCheckKey:true];
|
|
}
|
|
|
|
LocalPrivateKey *privateKey = [self getApplicationSecretKey:baseAppBundleId isCheckKey:false];
|
|
if (privateKey == nil) {
|
|
[self removeApplicationSecretKey:baseAppBundleId isCheckKey:false];
|
|
[self removeApplicationSecretKey:baseAppBundleId isCheckKey:true];
|
|
privateKey = [self addApplicationSecretKey:baseAppBundleId isCheckKey:false];
|
|
privateKey = [self addApplicationSecretKey:baseAppBundleId isCheckKey:true];
|
|
}
|
|
completion([privateKey getPublicKey]);
|
|
});
|
|
}
|
|
|
|
+ (void)encryptApplicationSecret:(NSData * _Nonnull)secret baseAppBundleId:(NSString * _Nonnull)baseAppBundleId completion:(void (^)(NSData * _Nullable, NSData * _Nullable))completion {
|
|
dispatch_async([self encryptionQueue], ^{
|
|
LocalPrivateKey *privateKey = [self getApplicationSecretKey:baseAppBundleId isCheckKey:false];
|
|
if (privateKey == nil) {
|
|
[self removeApplicationSecretKey:baseAppBundleId isCheckKey:false];
|
|
[self removeApplicationSecretKey:baseAppBundleId isCheckKey:true];
|
|
privateKey = [self addApplicationSecretKey:baseAppBundleId isCheckKey:false];
|
|
privateKey = [self addApplicationSecretKey:baseAppBundleId isCheckKey:true];
|
|
}
|
|
if (privateKey == nil) {
|
|
completion(nil, nil);
|
|
return;
|
|
}
|
|
NSData *result = [privateKey encrypt:secret];
|
|
completion(result, [privateKey getPublicKey]);
|
|
});
|
|
}
|
|
|
|
+ (void)decryptApplicationSecret:(NSData * _Nonnull)secret publicKey:(NSData * _Nonnull)publicKey baseAppBundleId:(NSString * _Nonnull)baseAppBundleId completion:(void (^)(NSData * _Nullable, bool))completion {
|
|
dispatch_async([self encryptionQueue], ^{
|
|
LocalPrivateKey *privateKey = [self getApplicationSecretKey:baseAppBundleId isCheckKey:false];
|
|
if (privateKey == nil) {
|
|
completion(nil, false);
|
|
return;
|
|
}
|
|
if (privateKey == nil) {
|
|
completion(nil, false);
|
|
return;
|
|
}
|
|
NSData *currentPublicKey = [privateKey getPublicKey];
|
|
if (currentPublicKey == nil) {
|
|
completion(nil, false);
|
|
return;
|
|
}
|
|
if (![publicKey isEqualToData:currentPublicKey]) {
|
|
completion(nil, false);
|
|
return;
|
|
}
|
|
bool cancelled = false;
|
|
NSData *result = [privateKey decrypt:secret cancelled:&cancelled];
|
|
completion(result, cancelled);
|
|
});
|
|
}
|
|
|
|
@end
|