iOS: Implement SHA functions with UTF8 and Base64 inputs

Author: Chris Thompson

ios/RCTCrypto.xcodeproj/project.pbxproj

@@ -158,7 +158,7 @@
 		32D980D51BE9F11C00FA27E5 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 1140;
 				ORGANIZATIONNAME = pedrouid;
 				TargetAttributes = {
 					32D980DC1BE9F11C00FA27E5 = {
@@ -171,6 +171,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 32D980D41BE9F11C00FA27E5;
@@ -215,20 +216,29 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -259,14 +269,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

ios/RCTCrypto/lib/Sha.h

@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 
 @interface Sha : NSObject
-+ (NSString *) sha1: (NSString *)input;
-+ (NSString *) sha256: (NSString *)input;
-+ (NSString *) sha512: (NSString *)input;
++ (NSData *) sha: (NSData *)input :(NSString *)type;
++ (NSString *) shaUtf8: (NSString *)input :(NSString *)type;;
++ (NSString *) shaBase64: (NSString *)input :(NSString *)type;;
 @end

ios/RCTCrypto/lib/Sha.m

@@ -5,27 +5,43 @@
 
 @implementation Sha
 
-+ (NSString *) sha1: (NSString *)input {
-    NSData* inputData = [input dataUsingEncoding:NSUTF8StringEncoding];
-    NSMutableData *result = [[NSMutableData alloc] initWithLength:CC_SHA1_DIGEST_LENGTH];
-    CC_SHA1([inputData bytes], (CC_LONG)[inputData length], result.mutableBytes);
-    return [Shared toHex:result];
++ (NSData *) sha: (NSData *)input :(NSString *)type {
+    NSDictionary *algMap = @{
+        @"SHA-1" : [NSNumber numberWithInt:CC_SHA1_DIGEST_LENGTH],
+        @"SHA-256" : [NSNumber numberWithInt:CC_SHA256_DIGEST_LENGTH],
+        @"SHA-512" : [NSNumber numberWithInt:CC_SHA512_DIGEST_LENGTH],
+    };
+
+    int digestLength = [[algMap valueForKey:type] intValue];
+    if (digestLength == 0) {
+        [NSException raise:@"Invalid hash algorithm" format:@"%@ is not a valid hash algorithm", type];
+    }
+
+    if (digestLength == CC_SHA1_DIGEST_LENGTH) {
+        NSMutableData *result = [[NSMutableData alloc] initWithLength:CC_SHA1_DIGEST_LENGTH];
+        CC_SHA1([input bytes], (CC_LONG)[input length], result.mutableBytes);
+        return result;
+    } else {
+        unsigned char* buffer = malloc(digestLength);
+        if (digestLength == CC_SHA256_DIGEST_LENGTH) {
+            CC_SHA256([input bytes], (CC_LONG)[input length], buffer);
+        } else {
+            CC_SHA512([input bytes], (CC_LONG)[input length], buffer);
+        }
+        return [NSData dataWithBytesNoCopy:buffer length:digestLength freeWhenDone:YES];
+    }
 }
 
-+ (NSString *) sha256: (NSString *)input {
++ (NSString *) shaUtf8: (NSString *)input :(NSString *)type {
     NSData* inputData = [input dataUsingEncoding:NSUTF8StringEncoding];
-    unsigned char* buffer = malloc(CC_SHA256_DIGEST_LENGTH);
-    CC_SHA256([inputData bytes], (CC_LONG)[inputData length], buffer);
-    NSData *result = [NSData dataWithBytesNoCopy:buffer length:CC_SHA256_DIGEST_LENGTH freeWhenDone:YES];
+    NSData* result = [self sha:inputData :type];
     return [Shared toHex:result];
 }
 
-+ (NSString *) sha512: (NSString *)input {
-    NSData* inputData = [input dataUsingEncoding:NSUTF8StringEncoding];
-    unsigned char* buffer = malloc(CC_SHA512_DIGEST_LENGTH);
-    CC_SHA512([inputData bytes], (CC_LONG)[inputData length], buffer);
-    NSData *result = [NSData dataWithBytesNoCopy:buffer length:CC_SHA512_DIGEST_LENGTH freeWhenDone:YES];
-    return [Shared toHex:result];
++ (NSString *) shaBase64: (NSString *)input :(NSString *)type {
+    NSData* inputData = [[NSData alloc] initWithBase64EncodedString:input options:0];
+    NSData* result = [self sha:inputData :type];
+    return [result base64EncodedStringWithOptions:0];
 }
 
 @end