Skip to content

Fix issue #3 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rickytribbia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue #3 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Obfuscator/Obfuscator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* @warning The salt used to obfuscate must be exactly the same for reveal to work.
* @return Obfuscator class instance.
*/
+ (instancetype)newWithSalt:(Class)class, ... NS_REQUIRES_NIL_TERMINATION;
+ (instancetype)newWithSalt:(Class)classParam, ... NS_REQUIRES_NIL_TERMINATION;

/*!
* @brief Create Obfuscator class using salts stored in key-value database.
Expand Down Expand Up @@ -130,7 +130,7 @@
* @warning Does not get bridged to Swift. Use from within Objective-C code so that the salts will become
* available to Swift code by using: `+ (NSString *)reveal:UsingStoredSalt:` or `+ (instancetype)newUsingStoredSalt:`.
*/
+ (void)storeKey:(NSString *)key forSalt:(Class)class, ... NS_REQUIRES_NIL_TERMINATION;
+ (void)storeKey:(NSString *)key forSalt:(Class)classParam, ... NS_REQUIRES_NIL_TERMINATION;

/*!
* @brief Converts obfuscated hard-coded C-String back to original string during run-time.
Expand Down
16 changes: 8 additions & 8 deletions Obfuscator/Obfuscator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ @implementation Obfuscator
static NSMutableDictionary *saltDatabase;


+ (void)storeKey:(NSString *)key forSalt:(Class)class, ...
+ (void)storeKey:(NSString *)key forSalt:(Class)classParam, ...
{
if (saltDatabase == nil)
saltDatabase = [[NSMutableDictionary alloc] init];
Expand All @@ -40,10 +40,10 @@ + (void)storeKey:(NSString *)key forSalt:(Class)class, ...

id eachClass;
va_list argumentList;
if (class) // The first argument isn't part of the varargs list,
if (classParam) // The first argument isn't part of the varargs list,
{
classes = [[NSMutableString alloc] initWithString:NSStringFromClass(class)];
va_start(argumentList, class); // Start scanning for arguments after class.
classes = [[NSMutableString alloc] initWithString:NSStringFromClass(classParam)];
va_start(argumentList, classParam); // Start scanning for arguments after class.
while ((eachClass = va_arg(argumentList, id))) // As many times as we can get an argument of type "id"
[classes appendString:NSStringFromClass(eachClass)];
va_end(argumentList);
Expand All @@ -52,16 +52,16 @@ + (void)storeKey:(NSString *)key forSalt:(Class)class, ...
[saltDatabase setValue:[classes copy] forKey:key];
}

+ (instancetype)newWithSalt:(Class)class, ...
+ (instancetype)newWithSalt:(Class)classParam, ...
{
NSMutableString *classes;

id eachClass;
va_list argumentList;
if (class) // The first argument isn't part of the varargs list,
if (classParam) // The first argument isn't part of the varargs list,
{
classes = [[NSMutableString alloc] initWithString:NSStringFromClass(class)];
va_start(argumentList, class); // Start scanning for arguments after class.
classes = [[NSMutableString alloc] initWithString:NSStringFromClass(classParam)];
va_start(argumentList, classParam); // Start scanning for arguments after class.
while ((eachClass = va_arg(argumentList, id))) // As many times as we can get an argument of type "id"
[classes appendString:NSStringFromClass(eachClass)];
va_end(argumentList);
Expand Down