Skip to content

Add object detection, tracking, mobile notifications, and search to any security camera.

different enc and de keys

roryclear9b23babd8dd5
diff --git a/clearcam/SceneDelegate.m b/clearcam/SceneDelegate.m
index 7c823ba..d18b8b2 100644
--- a/clearcam/SceneDelegate.m
+++ b/clearcam/SceneDelegate.m
@@ -179,7 +179,7 @@
NSLog(@"Read .aes file successfully. Size: %lu bytes", (unsigned long)encryptedData.length);
// Attempt to decrypt the data using stored keys
- NSArray<NSString *> *storedKeys = [[SecretManager sharedManager] getAllStoredKeys];
+ NSArray<NSString *> *storedKeys = [[SecretManager sharedManager] getAllDecryptionKeys];
__block NSData *decryptedData = nil; // Add __block specifier
__block NSString *successfulKey = nil; // Add __block specifier
@@ -202,7 +202,8 @@
if (decryptedData) { // Key worked
// Save the correct key to the secret manager
NSError *saveError = nil;
- if (![[SecretManager sharedManager] saveKey:userProvidedKey error:&saveError]) {
+ //todo can two have the same identifier
+ if(![[SecretManager sharedManager] saveDecryptionKey:@"MyDecryptionKey" withIdentifier:@"decryption_key" error:&saveError]) {
NSLog(@"Failed to save key to SecretManager: %@", saveError.localizedDescription);
}
successfulKey = userProvidedKey;
diff --git a/clearcam/SceneState.m b/clearcam/SceneState.m
index 53bc860..8e54623 100644
--- a/clearcam/SceneState.m
+++ b/clearcam/SceneState.m
@@ -189,7 +189,7 @@
if (encryptImage) {
// Retrieve the user's password from the Keychain
- NSString *encryptionKey = [[[SecretManager sharedManager] getAllStoredKeys] firstObject];
+ NSString *encryptionKey = [[SecretManager sharedManager] getEncryptionKey];
if (!encryptionKey) {
NSLog(@"Encryption key not found in Keychain. Encryption aborted.");
diff --git a/clearcam/SecretManager.h b/clearcam/SecretManager.h
index 2692104..a538c8b 100644
--- a/clearcam/SecretManager.h
+++ b/clearcam/SecretManager.h
@@ -8,18 +8,20 @@
// Singleton instance
+ (instancetype)sharedManager;
-// Retrieve all stored keys from the Keychain
-- (NSArray<NSString *> *)getAllStoredKeys;
+// Encryption Key Management (Single Key)
+- (BOOL)saveEncryptionKey:(NSString *)key error:(NSError **)error;
+- (NSString *)getEncryptionKey;
-// Save a key to the Keychain
-- (BOOL)saveKey:(NSString *)key error:(NSError **)error;
+// Decryption Key Management (Multiple Keys)
+- (BOOL)saveDecryptionKey:(NSString *)key withIdentifier:(NSString *)identifier error:(NSError **)error;
+- (NSArray<NSString *> *)getAllDecryptionKeys;
+- (BOOL)deleteDecryptionKeyWithIdentifier:(NSString *)identifier error:(NSError **)error;
-// Delete a specific key from the Keychain using its identifier
+// Generic Key Management
- (BOOL)deleteKeyWithIdentifier:(NSString *)identifier error:(NSError **)error;
-
-// Delete all keys from the Keychain
- (BOOL)deleteAllKeysWithError:(NSError **)error;
@end
#endif /* SecretManager_h */
+
diff --git a/clearcam/SecretManager.m b/clearcam/SecretManager.m
index cb9a456..9658ad1 100644
--- a/clearcam/SecretManager.m
+++ b/clearcam/SecretManager.m
@@ -50,40 +50,105 @@ static NSString *const kServiceIdentifier = @"com.yourapp.aeskeys"; // Replace w
return [keys copy];
}
-#pragma mark - Key Storage
-- (BOOL)saveKey:(NSString *)key error:(NSError **)error {
+- (BOOL)saveEncryptionKey:(NSString *)key error:(NSError **)error {
if (!key) {
if (error) {
*error = [NSError errorWithDomain:@"SecretManagerErrorDomain"
code:-1
- userInfo:@{NSLocalizedDescriptionKey: @"Key cannot be nil."}];
+ userInfo:@{NSLocalizedDescriptionKey: @"Encryption key cannot be nil."}];
}
return NO;
}
-
- // Convert key to data
+
NSData *keyData = [key dataUsingEncoding:NSUTF8StringEncoding];
-
- // Create a unique identifier for the key (e.g., UUID)
- NSString *keyIdentifier = [[NSUUID UUID] UUIDString];
-
- // Keychain query to add the key
+
+ // Define a fixed identifier for the encryption key
+ NSString *encryptionKeyIdentifier = @"encryption_key";
+
+ // Delete any existing encryption key before saving a new one
+ [self deleteKeyWithIdentifier:encryptionKeyIdentifier error:nil];
+
NSDictionary *query = @{
(__bridge id)kSecClass: (__bridge id)kSecClassGenericPassword,
(__bridge id)kSecAttrService: kServiceIdentifier,
- (__bridge id)kSecAttrAccount: keyIdentifier,
+ (__bridge id)kSecAttrAccount: encryptionKeyIdentifier,
(__bridge id)kSecValueData: keyData,
- (__bridge id)kSecAttrAccessible: (__bridge id)kSecAttrAccessibleWhenUnlocked // Restrict access to when device is unlocked
+ (__bridge id)kSecAttrAccessible: (__bridge id)kSecAttrAccessibleWhenUnlocked
};
-
- // Delete any existing item with the same identifier (optional, to avoid duplicates)
+
+ OSStatus status = SecItemAdd((__bridge CFDictionaryRef)query, NULL);
+ if (status != errSecSuccess) {
+ NSLog(@"Failed to save encryption key: %d", (int)status);
+ if (error) {
+ *error = [NSError errorWithDomain:@"SecretManagerErrorDomain"
+ code:status
+ userInfo:@{NSLocalizedDescriptionKey: [self errorMessageForStatus:status]}];
+ }
+ return NO;
+ }
+
+ NSLog(@"Successfully saved encryption key.");
+ return YES;
+}
+
+- (NSArray<NSString *> *)getAllDecryptionKeys {
+ NSMutableArray<NSString *> *keys = [NSMutableArray array];
+
+ NSDictionary *query = @{
+ (__bridge id)kSecClass: (__bridge id)kSecClassGenericPassword,
+ (__bridge id)kSecAttrService: kServiceIdentifier,
+ (__bridge id)kSecReturnAttributes: @YES,
+ (__bridge id)kSecReturnData: @YES,
+ (__bridge id)kSecMatchLimit: (__bridge id)kSecMatchLimitAll
+ };
+
+ CFTypeRef result = NULL;
+ OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)query, &result);
+ if (status == errSecSuccess) {
+ NSArray *items = (__bridge_transfer NSArray *)result;
+ for (NSDictionary *item in items) {
+ NSString *identifier = item[(__bridge id)kSecAttrAccount];
+ if (![identifier isEqualToString:@"encryption_key"]) { // Ignore the encryption key
+ NSData *keyData = item[(__bridge id)kSecValueData];
+ NSString *key = [[NSString alloc] initWithData:keyData encoding:NSUTF8StringEncoding];
+ if (key) {
+ [keys addObject:key];
+ }
+ }
+ }
+ }
+
+ return [keys copy];
+}
+
+
+- (BOOL)saveDecryptionKey:(NSString *)key withIdentifier:(NSString *)identifier error:(NSError **)error {
+ if (!key || !identifier) {
+ if (error) {
+ *error = [NSError errorWithDomain:@"SecretManagerErrorDomain"
+ code:-1
+ userInfo:@{NSLocalizedDescriptionKey: @"Decryption key and identifier cannot be nil."}];
+ }
+ return NO;
+ }
+
+ NSData *keyData = [key dataUsingEncoding:NSUTF8StringEncoding];
+
+ NSDictionary *query = @{
+ (__bridge id)kSecClass: (__bridge id)kSecClassGenericPassword,
+ (__bridge id)kSecAttrService: kServiceIdentifier,
+ (__bridge id)kSecAttrAccount: identifier,
+ (__bridge id)kSecValueData: keyData,
+ (__bridge id)kSecAttrAccessible: (__bridge id)kSecAttrAccessibleWhenUnlocked
+ };
+
+ // Ensure we don't overwrite an existing key with the same identifier
SecItemDelete((__bridge CFDictionaryRef)query);
-
- // Add the key to the Keychain
+
OSStatus status = SecItemAdd((__bridge CFDictionaryRef)query, NULL);
if (status != errSecSuccess) {
- NSLog(@"Failed to save key to Keychain: %d", (int)status);
+ NSLog(@"Failed to save decryption key: %d", (int)status);
if (error) {
*error = [NSError errorWithDomain:@"SecretManagerErrorDomain"
code:status
@@ -91,11 +156,36 @@ static NSString *const kServiceIdentifier = @"com.yourapp.aeskeys"; // Replace w
}
return NO;
}
-
- NSLog(@"Successfully saved key to Keychain with identifier: %@", keyIdentifier);
+
+ NSLog(@"Successfully saved decryption key with identifier: %@", identifier);
return YES;
}
+
+- (NSString *)getEncryptionKey {
+ NSString *encryptionKeyIdentifier = @"encryption_key";
+
+ NSDictionary *query = @{
+ (__bridge id)kSecClass: (__bridge id)kSecClassGenericPassword,
+ (__bridge id)kSecAttrService: kServiceIdentifier,
+ (__bridge id)kSecAttrAccount: encryptionKeyIdentifier,
+ (__bridge id)kSecReturnData: @YES,
+ (__bridge id)kSecMatchLimit: (__bridge id)kSecMatchLimitOne
+ };
+
+ CFTypeRef result = NULL;
+ OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)query, &result);
+
+ if (status == errSecSuccess) {
+ NSData *keyData = (__bridge_transfer NSData *)result;
+ return [[NSString alloc] initWithData:keyData encoding:NSUTF8StringEncoding];
+ }
+
+ NSLog(@"Encryption key not found.");
+ return nil;
+}
+
+
#pragma mark - Key Deletion
- (BOOL)deleteKeyWithIdentifier:(NSString *)identifier error:(NSError **)error {
diff --git a/clearcam/SettingsViewController.m b/clearcam/SettingsViewController.m
index 579341b..a24d3f6 100644
--- a/clearcam/SettingsViewController.m
+++ b/clearcam/SettingsViewController.m
@@ -261,7 +261,7 @@
}
NSError *error = nil;
- BOOL success = [[SecretManager sharedManager] saveKey:password error:&error];
+ BOOL success = [[SecretManager sharedManager] saveEncryptionKey:password error:&error];
if (!success) {
NSLog(@"Failed to save password to Keychain: %@", error.localizedDescription);
@@ -271,12 +271,10 @@
}
- (NSString *)retrievePasswordFromSecretsManager {
- NSArray<NSString *> *storedKeys = [[SecretManager sharedManager] getAllStoredKeys];
-
- if (storedKeys.count > 0) {
- return storedKeys.firstObject; // Assuming only one password is stored
+ NSString *storedKey = [[SecretManager sharedManager] getEncryptionKey];
+ if (storedKey) {
+ return storedKey; // Assuming only one password is stored
}
-
NSLog(@"No password found in Keychain.");
return nil;
}