Feat/sdk 4227/Encryption v2 #400
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // | ||
| // AESCrypt.h | ||
| // Pods | ||
| // | ||
| // Created by Kushagra Mishra on 29/01/25. | ||
| // | ||
| #import <Foundation/Foundation.h> | ||
| #import <CommonCrypto/CommonCrypto.h> | ||
|
|
||
| @interface AESCrypt : NSObject | ||
|
|
||
| + (NSData *)AES128WithOperation:(CCOperation)operation | ||
| key:(NSString *)key | ||
| identifier:(NSString *)identifier | ||
| data:(NSData *)data; | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // | ||
| // AESCrypt.m | ||
| // Pods | ||
| // | ||
| // Created by Kushagra Mishra on 29/01/25. | ||
| // | ||
| #import "AESCrypt.h" | ||
|
|
||
| @implementation AESCrypt : NSObject | ||
|
|
||
| + (NSData *)AES128WithOperation:(CCOperation)operation | ||
| key:(NSString *)key | ||
| identifier:(NSString *)identifier | ||
| data:(NSData *)data { | ||
| // Note: The key will be 0's but we intentionally are keeping it this way to maintain | ||
| // compatibility. The correct code is: | ||
| // char keyPtr[[key length] + 1]; | ||
| char keyCString[kCCKeySizeAES128 + 1]; | ||
| memset(keyCString, 0, sizeof(keyCString)); | ||
| [key getCString:keyCString maxLength:sizeof(keyCString) encoding:NSUTF8StringEncoding]; | ||
|
|
||
| char identifierCString[kCCBlockSizeAES128 + 1]; | ||
| memset(identifierCString, 0, sizeof(identifierCString)); | ||
| [identifier getCString:identifierCString | ||
| maxLength:sizeof(identifierCString) | ||
| encoding:NSUTF8StringEncoding]; | ||
|
|
||
| size_t outputAvailableSize = [data length] + kCCBlockSizeAES128; | ||
| void *output = malloc(outputAvailableSize); | ||
|
|
||
|
Comment on lines
+28
to
+30
There was a problem hiding this comment. Potential memory leak in output buffer handling. The - return [NSData dataWithBytesNoCopy:output length:outputMovedSize];
+ return [NSData dataWithBytesNoCopy:output length:outputMovedSize freeWhenDone:YES];Also applies to: 50-50 |
||
| size_t outputMovedSize = 0; | ||
| CCCryptorStatus cryptStatus = CCCrypt(operation, | ||
| kCCAlgorithmAES128, | ||
| kCCOptionPKCS7Padding, | ||
| keyCString, | ||
| kCCBlockSizeAES128, | ||
| identifierCString, | ||
| [data bytes], | ||
| [data length], | ||
| output, | ||
| outputAvailableSize, | ||
| &outputMovedSize); | ||
|
|
||
| if (cryptStatus != kCCSuccess) { | ||
| NSLog(@"Failed to encode/decode the string with error code: %d", cryptStatus); | ||
| free(output); | ||
| return nil; | ||
| } | ||
|
|
||
| return [NSData dataWithBytesNoCopy:output length:outputMovedSize]; | ||
| } | ||
|
|
||
| @end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| // | ||
| // AESGCMCrypt.swift | ||
| // Pods | ||
| // | ||
| // Created by Kushagra Mishra on 29/01/25. | ||
| // | ||
|
|
||
| import Foundation | ||
| import CryptoKit | ||
|
|
||
| @objc public enum AESGCMEncryptionErrorCode: Int { | ||
| case encryptionFailed | ||
| case decryptionFailed | ||
| case invalidData | ||
| case dataNotFound | ||
| } | ||
|
|
||
| @objcMembers | ||
| class AESGCMCryptResult: NSObject { | ||
| let iv: Data | ||
| let data: Data | ||
|
|
||
| init(iv: Data, data: Data) { | ||
| self.iv = iv | ||
| self.data = data | ||
| super.init() | ||
| } | ||
| } | ||
|
|
||
| @objc enum CryptError: Int, Error { | ||
| case invalidMode = 0 | ||
| case keyGenerationFailed = 1 | ||
| case encryptionFailed = 2 | ||
| case decryptionFailed = 3 | ||
| case ivRequired = 4 | ||
| } | ||
|
|
||
| @available(iOS 13, *) | ||
| @objcMembers | ||
| class AESGCMCrypt: NSObject { | ||
| private let keyIdentifier = "your.key.identifier" | ||
| private static let ivSize = 12 | ||
|
|
||
| private func generateOrGetKey() throws -> SymmetricKey { | ||
| if let existingKey = try? getKeyFromKeychain() { | ||
| return existingKey | ||
| } | ||
|
|
||
| let newKey = SymmetricKey(size: .bits256) | ||
| try storeKeyInKeychain(newKey) | ||
| return newKey | ||
| } | ||
|
Comment on lines
+38
to
+52
There was a problem hiding this comment. 🛠️ Refactor suggestion Handle Keychain concurrency or errors more explicitly. |
||
|
|
||
| func performCryptOperation(mode: Bool, data: Data, iv: Data? = nil) throws -> AESGCMCryptResult { | ||
| let key = try generateOrGetKey() | ||
|
|
||
| if mode { // Encrypt | ||
| let nonce = try AES.GCM.Nonce(data: iv ?? Data()) | ||
| let sealedBox = try AES.GCM.seal(data, using: key, nonce: nonce) | ||
|
|
||
| return AESGCMCryptResult( | ||
| iv: sealedBox.nonce.withUnsafeBytes { Data($0) }, | ||
| data: sealedBox.ciphertext + sealedBox.tag | ||
| ) | ||
| } else { // Decrypt | ||
| guard let iv = iv else { | ||
| throw CryptError.ivRequired | ||
| } | ||
|
|
||
| let tagLength = 16 | ||
| let ciphertext = data.dropLast(tagLength) | ||
| let tag = data.suffix(tagLength) | ||
|
|
||
| let nonce = try AES.GCM.Nonce(data: iv) | ||
| let sealedBox = try AES.GCM.SealedBox( | ||
| nonce: nonce, | ||
| ciphertext: ciphertext, | ||
| tag: tag | ||
| ) | ||
|
|
||
| let decryptedData = try AES.GCM.open(sealedBox, using: key) | ||
| return AESGCMCryptResult(iv: iv, data: decryptedData) | ||
| } | ||
| } | ||
|
|
||
|
|
||
| private func storeKeyInKeychain(_ key: SymmetricKey) throws { | ||
| // Implement secure key storage in Keychain | ||
| } | ||
|
|
||
| private func getKeyFromKeychain() throws -> SymmetricKey? { | ||
| // Implement secure key retrieval from Keychain | ||
| return nil | ||
| } | ||
| } | ||
|
Comment on lines
+85
to
+95
There was a problem hiding this comment. Implement or remove placeholder methods. - private func storeKeyInKeychain(_ key: SymmetricKey) throws {
- // Implement secure key storage in Keychain
- }
+ private func storeKeyInKeychain(_ key: SymmetricKey) throws {
+ // Suggested implementation example or future integration:
+ // 1. Convert SymmetricKey to raw data
+ // 2. Use Keychain Services to store
+ // 3. Handle OSStatus errors
+ }
- private func getKeyFromKeychain() throws -> SymmetricKey? {
- // Implement secure key retrieval from Keychain
- return nil
- }
+ private func getKeyFromKeychain() throws -> SymmetricKey? {
+ // 1. Obtain raw data from Keychain
+ // 2. Convert raw data to SymmetricKey
+ // 3. Return the key object or nil if not found
+ }
|
||
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // | ||
| // EncryptionBridge.h | ||
| // Pods | ||
| // | ||
| // Created by Kushagra Mishra on 29/01/25. | ||
| // | ||
| #import <Foundation/Foundation.h> | ||
| #import <CommonCrypto/CommonCrypto.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @interface CTEncryptor : NSObject | ||
|
|
||
| // Key Management | ||
| + (BOOL)generateKeyWithError:(NSError **)error; | ||
| + (BOOL)deleteKeyWithError:(NSError **)error; | ||
|
|
||
| // Encryption/Decryption | ||
| + (NSString * _Nullable)performCryptOperation:(NSString *)string error:(NSError **)error; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codebase verification
Add Swift version 6.0 to podspec
The main SDK project uses Swift 6.0, and the podspec should align with this version for the newly added Swift files:
s.ios.source_files = 'CleverTapSDK/**/*.{h,m,swift}' +s.swift_version = '6.0'🔗 Analysis chain
Verify Swift version compatibility.
The addition of Swift files requires specifying the minimum Swift version for compatibility.
Consider adding the Swift version specification:
s.ios.source_files = 'CleverTapSDK/**/*.{h,m,swift}' +s.swift_version = '5.0'Let's verify the Swift files in the project:
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
Length of output: 2715