Skip to content
Browse files

fixing issues with sha1 in 64-bit mode, now using CommonCrypto to gen…

…erate hmac-sha1 data
  • Loading branch information...
1 parent 03cfa6b commit d99d25ed7498b80d45a1ba3ab3edf727e8e81983 @zagraves zagraves committed Sep 17, 2009
View
85 Source/YOAuth/Crypto/hmac.c
@@ -1,85 +0,0 @@
-//
-// hmac.c
-// OAuthConsumer
-//
-// Created by Jonathan Wight on 4/8/8.
-// Copyright 2008 Jonathan Wight. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-/*
- * Implementation of HMAC-SHA1. Adapted from example at http://tools.ietf.org/html/rfc2104
- */
-
-#include "sha1.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-void hmac_sha1(const unsigned char *inText, size_t inTextLength, unsigned char* inKey, size_t inKeyLength, unsigned char *outDigest)
-{
-const size_t B = 64;
-const size_t L = 20;
-
-SHA1_CTX theSHA1Context;
-unsigned char k_ipad[B + 1]; /* inner padding - key XORd with ipad */
-unsigned char k_opad[B + 1]; /* outer padding - key XORd with opad */
-
-/* if key is longer than 64 bytes reset it to key=SHA1 (key) */
-if (inKeyLength > B)
- {
- SHA1Init(&theSHA1Context);
- SHA1Update(&theSHA1Context, inKey, inKeyLength);
- SHA1Final(inKey, &theSHA1Context);
- inKeyLength = L;
- }
-
-/* start out by storing key in pads */
-memset(k_ipad, 0, sizeof k_ipad);
-memset(k_opad, 0, sizeof k_opad);
-memcpy(k_ipad, inKey, inKeyLength);
-memcpy(k_opad, inKey, inKeyLength);
-
-/* XOR key with ipad and opad values */
-int i;
-for (i = 0; i < B; i++)
- {
- k_ipad[i] ^= 0x36;
- k_opad[i] ^= 0x5c;
- }
-
-/*
-* perform inner SHA1
-*/
-SHA1Init(&theSHA1Context); /* init context for 1st pass */
-SHA1Update(&theSHA1Context, k_ipad, B); /* start with inner pad */
-SHA1Update(&theSHA1Context, (unsigned char *)inText, inTextLength); /* then text of datagram */
-SHA1Final((unsigned char *)outDigest, &theSHA1Context); /* finish up 1st pass */
-
-/*
-* perform outer SHA1
-*/
-SHA1Init(&theSHA1Context); /* init context for 2nd
-* pass */
-SHA1Update(&theSHA1Context, k_opad, B); /* start with outer pad */
-SHA1Update(&theSHA1Context, outDigest, L); /* then results of 1st
-* hash */
-SHA1Final(outDigest, &theSHA1Context); /* finish up 2nd pass */
-
-}
View
31 Source/YOAuth/Crypto/hmac.h
@@ -1,31 +0,0 @@
-//
-// hmac.h
-// OAuthConsumer
-//
-// Created by Jonathan Wight on 4/8/8.
-// Copyright 2008 Jonathan Wight. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#ifndef HMAC_H
-#define HMAC_H 1
-
-extern void hmac_sha1(const unsigned char *inText, int inTextLength, unsigned char* inKey, const unsigned int inKeyLength, unsigned char *outDigest);
-
-#endif /* HMAC_H */
View
169 Source/YOAuth/Crypto/sha1.c
@@ -1,169 +0,0 @@
-/*
-SHA-1 in C
-By Steve Reid <steve@edmweb.com>
-100% Public Domain
-
-Test Vectors (from FIPS PUB 180-1)
-"abc"
- A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
-"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
- 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
-A million repetitions of "a"
- 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
-*/
-
-/* #define LITTLE_ENDIAN * This should be #define'd if true. */
-#if __LITTLE_ENDIAN__
-#define LITTLE_ENDIAN
-#endif
-/* #define SHA1HANDSOFF * Copies data before messing with it. */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "sha1.h"
-
-void SHA1Transform(unsigned long state[5], unsigned char buffer[64]);
-
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
-/* blk0() and blk() perform the initial expand. */
-/* I got the idea of expanding during the round function from SSLeay */
-#ifdef LITTLE_ENDIAN
-#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
- |(rol(block->l[i],8)&0x00FF00FF))
-#else
-#define blk0(i) block->l[i]
-#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
- ^block->l[(i+2)&15]^block->l[i&15],1))
-
-/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-
-/* Hash a single 512-bit block. This is the core of the algorithm. */
-
-void SHA1Transform(unsigned long state[5], unsigned char buffer[64])
-{
-unsigned long a, b, c, d, e;
-typedef union {
- unsigned char c[64];
- unsigned long l[16];
-} CHAR64LONG16;
-CHAR64LONG16* block;
-#ifdef SHA1HANDSOFF
-static unsigned char workspace[64];
- block = (CHAR64LONG16*)workspace;
- memcpy(block, buffer, 64);
-#else
- block = (CHAR64LONG16*)buffer;
-#endif
- /* Copy context->state[] to working vars */
- a = state[0];
- b = state[1];
- c = state[2];
- d = state[3];
- e = state[4];
- /* 4 rounds of 20 operations each. Loop unrolled. */
- R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
- R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
- R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
- R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
- R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
- R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
- R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
- R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
- R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
- R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
- R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
- R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
- R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
- R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
- R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
- R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
- R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
- R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
- R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
- R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
- /* Add the working vars back into context.state[] */
- state[0] += a;
- state[1] += b;
- state[2] += c;
- state[3] += d;
- state[4] += e;
- /* Wipe variables */
- a = b = c = d = e = 0;
-}
-
-
-/* SHA1Init - Initialize new context */
-
-void SHA1Init(SHA1_CTX* context)
-{
- /* SHA1 initialization constants */
- context->state[0] = 0x67452301;
- context->state[1] = 0xEFCDAB89;
- context->state[2] = 0x98BADCFE;
- context->state[3] = 0x10325476;
- context->state[4] = 0xC3D2E1F0;
- context->count[0] = context->count[1] = 0;
-}
-
-
-/* Run your data through this. */
-
-void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int len)
-{
-unsigned int i, j;
-
- j = (context->count[0] >> 3) & 63;
- if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
- context->count[1] += (len >> 29);
- if ((j + len) > 63) {
- memcpy(&context->buffer[j], data, (i = 64-j));
@vinaychaharg
vinaychaharg added a note Dec 19, 2014

Crashing on this line in 64 bit

@michaelchum
michaelchum added a note Dec 19, 2014

It seems like these lines have been deleted, are you using the latest version?

@vinaychaharg
vinaychaharg added a note Dec 20, 2014

Can you please provide the link to latest version as I was not able to find one.

@michaelchum
michaelchum added a note Dec 21, 2014

In the master branch of this current repo, these lines do not appear. https://github.com/yahoo/yos-social-objc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
- SHA1Transform(context->state, context->buffer);
- for ( ; i + 63 < len; i += 64) {
- SHA1Transform(context->state, &data[i]);
- }
- j = 0;
- }
- else i = 0;
- memcpy(&context->buffer[j], &data[i], len - i);
-}
-
-
-/* Add padding and return the message digest. */
-
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
-{
-unsigned long i, j;
-unsigned char finalcount[8];
-
- for (i = 0; i < 8; i++) {
- finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
- >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
- }
- SHA1Update(context, (unsigned char *)"\200", 1);
- while ((context->count[0] & 504) != 448) {
- SHA1Update(context, (unsigned char *)"\0", 1);
- }
- SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */
- for (i = 0; i < 20; i++) {
- digest[i] = (unsigned char)
- ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
- }
- /* Wipe variables */
- i = j = 0;
- memset(context->buffer, 0, 64);
- memset(context->state, 0, 20);
- memset(context->count, 0, 8);
- memset(&finalcount, 0, 8);
-#ifdef SHA1HANDSOFF /* make SHA1Transform overwrite it's own static vars */
- SHA1Transform(context->state, context->buffer);
-#endif
-}
View
16 Source/YOAuth/Crypto/sha1.h
@@ -1,16 +0,0 @@
-//
-// SHA-1 in C
-// By Steve Reid <steve@edmweb.com>
-// 100% Public Domain
-// From http://www.mirrors.wiretapped.net/security/cryptography/hashes/sha1/sha1.c
-//
-
-typedef struct {
- unsigned long state[5];
- unsigned long count[2];
- unsigned char buffer[64];
-} SHA1_CTX;
-
-extern void SHA1Init(SHA1_CTX* context);
-extern void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int len);
-extern void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
View
18 Source/YOAuth/YOAuthSignatureMethod_HMAC-SHA1.m
@@ -10,31 +10,35 @@
#import "YOAuthSignatureMethod_HMAC-SHA1.h"
-#include "hmac.h"
-#include "Base64Transcoder.h"
+#import <CommonCrypto/CommonHMAC.h>
-static NSString *const kSignatureMethodName = @"HMAC-SHA1";
+#include "Base64Transcoder.h"
@implementation YOAuthSignatureMethod_HMAC_SHA1
#pragma mark Public
- (NSString *)name
{
- return [kSignatureMethodName autorelease];
+ return @"HMAC-SHA1";
}
- (NSString *)buildSignatureWithRequest:(NSString *)aSignableString andSecrets:(NSString *)aSecret
{
NSData *secretData = [aSecret dataUsingEncoding:NSUTF8StringEncoding];
NSData *clearTextData = [aSignableString dataUsingEncoding:NSUTF8StringEncoding];
- unsigned char result[20];
- hmac_sha1((unsigned char *)[clearTextData bytes], [clearTextData length], (unsigned char *)[secretData bytes], [secretData length], result);
+
+ uint8_t digest[CC_SHA1_DIGEST_LENGTH] = {0};
+
+ CCHmacContext hmacContext;
+ CCHmacInit(&hmacContext, kCCHmacAlgSHA1, secretData.bytes, secretData.length);
+ CCHmacUpdate(&hmacContext, clearTextData.bytes, clearTextData.length);
+ CCHmacFinal(&hmacContext, digest);
//Base64 Encoding
char base64Result[32];
size_t theResultLength = 32;
- Base64EncodeData(result, 20, base64Result, &theResultLength);
+ Base64EncodeData(digest, CC_SHA1_DIGEST_LENGTH, base64Result, &theResultLength);
NSData *theData = [NSData dataWithBytes:base64Result length:theResultLength];
NSString *base64EncodedResult = [[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding];
View
4 Source/YOAuth/YOAuthSignatureMethod_PLAINTEXT.m
@@ -10,15 +10,13 @@
#import "YOAuthSignatureMethod_PLAINTEXT.h"
-static NSString *const kSignatureMethodName = @"PLAINTEXT";
-
@implementation YOAuthSignatureMethod_PLAINTEXT
#pragma mark Public
- (NSString *)name
{
- return [kSignatureMethodName autorelease];
+ return @"PLAINTEXT";
}
- (NSString *)buildSignatureWithRequest:(NSString *)aSignableString andSecrets:(NSString *)aSecret

0 comments on commit d99d25e

Please sign in to comment.
Something went wrong with that request. Please try again.