Skip to content

Fixed HMAC algorithm so support all CCHmacAlgorithm types. #21

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
rckoenes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed HMAC algorithm so support all CCHmacAlgorithm types. #21

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
38 changes: 36 additions & 2 deletions CommonCrypto/NSData+CommonCrypto.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,11 +531,45 @@ - (NSData *) HMACWithAlgorithm: (CCHmacAlgorithm) algorithm key: (id) key
else
keyData = (NSData *) key;

NSInteger digestLength = 0;

switch (algorithm) {
case kCCHmacAlgSHA1:
digestLength = CC_SHA1_DIGEST_LENGTH;
break;

case kCCHmacAlgMD5:
digestLength = CC_MD5_DIGEST_LENGTH;
break;

case kCCHmacAlgSHA256:
digestLength = CC_SHA256_DIGEST_LENGTH;
break;

case kCCHmacAlgSHA384:
digestLength = CC_SHA384_DIGEST_LENGTH;
break;

case kCCHmacAlgSHA512:
digestLength = CC_SHA512_DIGEST_LENGTH;
break;

case kCCHmacAlgSHA224:
digestLength = CC_SHA224_DIGEST_LENGTH;
break;

default:
NSAssert(NO, @"Unkown CCHmacAlgorithm, could not detect digest length");
break;
}


// this could be either CC_SHA1_DIGEST_LENGTH or CC_MD5_DIGEST_LENGTH. SHA1 is larger.
unsigned char buf[CC_SHA1_DIGEST_LENGTH];
unsigned char buf[digestLength];
CCHmac( algorithm, [keyData bytes], [keyData length], [self bytes], [self length], buf );

return ( [NSData dataWithBytes: buf length: (algorithm == kCCHmacAlgMD5 ? CC_MD5_DIGEST_LENGTH : CC_SHA1_DIGEST_LENGTH)] );
return ( [NSData dataWithBytes: buf length: digestLength] );

}

@end