some helper category methods related to md5

WeTransferArchive · Oct 3, 2012 · bc99922 · bc99922
1 parent b14170a
commit bc99922
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 4 deletions.
diff --git a/S3Kit/S3Kit/BS3Requestor.m b/S3Kit/S3Kit/BS3Requestor.m
@@ -149,7 +149,7 @@ - (NSString *)authorizationHeader
 - (void)setHTTPBody:(NSData *)body
 {
 	HTTPBody = body;
-	[allHTTPHeaderFields setObject:[HTTPBody md5Signature] forKey:@"Content-Md5"];
+	[allHTTPHeaderFields setObject:[HTTPBody md5SignatureBase64] forKey:@"Content-Md5"];
 }
 
 - (NSMutableURLRequest *)composedRequest

diff --git a/S3Kit/S3Kit/NSData+Base64.h b/S3Kit/S3Kit/NSData+Base64.h
@@ -38,5 +38,6 @@ char *NewBase64Encode(
 
 + (NSData *)dataFromBase64String:(NSString *)aString;
 - (NSString *)base64EncodedString;
+- (NSString *)base16EncodedString;
 
 @end
diff --git a/S3Kit/S3Kit/NSData+Base64.m b/S3Kit/S3Kit/NSData+Base64.m
@@ -305,5 +305,24 @@ - (NSString *)base64EncodedString {
 }
 
 
+- (NSString *)base16EncodedString
+{
+    const unsigned char *dataBuffer = (const unsigned char *)[self bytes];
+
+    if (!dataBuffer)
+	{
+        return [NSString string];
+	}
+
+    NSUInteger dataLength  = [self length];
+    NSMutableString *hexString  = [NSMutableString stringWithCapacity:(dataLength * 2)];
+
+    for (int i = 0; i < dataLength; ++i)
+	{
+        [hexString appendString:[NSString stringWithFormat:@"%02x", (unsigned int)dataBuffer[i]]];
+	}
+
+    return [NSString stringWithString:hexString];
+}
 
 @end
diff --git a/S3Kit/S3Kit/NSData+MD5.h b/S3Kit/S3Kit/NSData+MD5.h
@@ -8,7 +8,9 @@
 
 @interface NSData (MD5)
 
-- (NSString *)md5Signature;
+- (NSData *)md5SignatureData;
+- (NSString *)md5SignatureBase64;
+- (NSString *)md5SignatureBase16;
 
 @end
 
diff --git a/S3Kit/S3Kit/NSData+MD5.m b/S3Kit/S3Kit/NSData+MD5.m
@@ -10,12 +10,22 @@
 
 @implementation NSData (MD5)
 
-- (NSString *)md5Signature
+- (NSData *)md5SignatureData
 {
     static const int kNumBytes = 16;
     unsigned char result[kNumBytes];
     CC_MD5([self bytes], [self length], result);
-    return [[NSData dataWithBytes:result length:sizeof(unsigned char) * kNumBytes] base64EncodedString];
+    return [NSData dataWithBytes:result length:sizeof(unsigned char) * kNumBytes];
+}
+
+- (NSString *)md5SignatureBase64
+{
+    return [[self md5SignatureData] base64EncodedString];
+}
+
+- (NSString *)md5SignatureBase16
+{
+    return [[self md5SignatureData] base16EncodedString];
 }
 
 @end

diff --git a/S3Kit/S3Kit/NSString+Crypto.h b/S3Kit/S3Kit/NSString+Crypto.h
@@ -9,6 +9,7 @@
 @interface NSString (Crypto)
 
 - (NSData *)encryptWithKey:(NSString *)privateKey;
+- (NSData *)dataFromBase16String;
 
 @end
 
diff --git a/S3Kit/S3Kit/NSString+Crypto.m b/S3Kit/S3Kit/NSString+Crypto.m
@@ -27,5 +27,29 @@ - (NSData *)encryptWithKey:(NSString *)privateKey
 
     return encryptedData;
 }
+
+- (NSData *)dataFromBase16String
+{
+    NSString *theString = [[self componentsSeparatedByCharactersInSet:
+		[NSCharacterSet whitespaceAndNewlineCharacterSet]] componentsJoinedByString:nil];
+
+    NSMutableData* data = [NSMutableData data];
+    int idx;
+
+	for (idx = 0; idx+2 <= theString.length; idx+=2)
+	{
+        NSRange range = NSMakeRange(idx, 2);
+        NSString *hexStr = [theString substringWithRange:range];
+        NSScanner *scanner = [NSScanner scannerWithString:hexStr];
+        unsigned int intValue;
+        if ([scanner scanHexInt:&intValue])
+		{
+            [data appendBytes:&intValue length:1];
+		}
+    }
+
+    return data;
+}
+
 @end