feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Used consistent constants.

Browse Source
This commit is contained in:
John Safranek
2012-07-12 15:20:56 -07:00
parent aaad893804
commit 87a8cfadd3
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ctaocrypt/src/hmac.c
View File

@@ -73,7 +73,8 @@ void HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length)
} }
} }
else if (hmac->macType == SHA) { else if (hmac->macType == SHA) {
if (length <= MD5_BLOCK_SIZE) { hmac_block_size = SHA_BLOCK_SIZE;
if (length <= SHA_BLOCK_SIZE) {
XMEMCPY(ip, key, length); XMEMCPY(ip, key, length);
} }
else { else {
@@ -84,7 +85,8 @@ void HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length)
} }
#ifndef NO_SHA256 #ifndef NO_SHA256
else if (hmac->macType == SHA256) { else if (hmac->macType == SHA256) {
if (length <= MD5_BLOCK_SIZE) { hmac_block_size = SHA256_BLOCK_SIZE;
if (length <= SHA256_BLOCK_SIZE) {
XMEMCPY(ip, key, length); XMEMCPY(ip, key, length);
} }
else { else {
@@ -121,10 +123,10 @@ static void HmacKeyInnerHash(Hmac* hmac)
if (hmac->macType == MD5) if (hmac->macType == MD5)
Md5Update(&hmac->hash.md5, (byte*) hmac->ipad, MD5_BLOCK_SIZE); Md5Update(&hmac->hash.md5, (byte*) hmac->ipad, MD5_BLOCK_SIZE);
else if (hmac->macType == SHA) else if (hmac->macType == SHA)
ShaUpdate(&hmac->hash.sha, (byte*) hmac->ipad, MD5_BLOCK_SIZE); ShaUpdate(&hmac->hash.sha, (byte*) hmac->ipad, SHA_BLOCK_SIZE);
#ifndef NO_SHA256 #ifndef NO_SHA256
else if (hmac->macType == SHA256) else if (hmac->macType == SHA256)
Sha256Update(&hmac->hash.sha256, (byte*) hmac->ipad, MD5_BLOCK_SIZE); Sha256Update(&hmac->hash.sha256, (byte*) hmac->ipad, SHA256_BLOCK_SIZE);
#endif #endif
#ifdef CYASSL_SHA384 #ifdef CYASSL_SHA384
else if (hmac->macType == SHA384) else if (hmac->macType == SHA384)
@@ -172,7 +174,7 @@ void HmacFinal(Hmac* hmac, byte* hash)
else if (hmac->macType == SHA) { else if (hmac->macType == SHA) {
ShaFinal(&hmac->hash.sha, (byte*) hmac->innerHash); ShaFinal(&hmac->hash.sha, (byte*) hmac->innerHash);
ShaUpdate(&hmac->hash.sha, (byte*) hmac->opad, MD5_BLOCK_SIZE); ShaUpdate(&hmac->hash.sha, (byte*) hmac->opad, SHA_BLOCK_SIZE);
ShaUpdate(&hmac->hash.sha, (byte*) hmac->innerHash, SHA_DIGEST_SIZE); ShaUpdate(&hmac->hash.sha, (byte*) hmac->innerHash, SHA_DIGEST_SIZE);
ShaFinal(&hmac->hash.sha, hash); ShaFinal(&hmac->hash.sha, hash);
@@ -181,7 +183,7 @@ void HmacFinal(Hmac* hmac, byte* hash)
else if (hmac->macType == SHA256) { else if (hmac->macType == SHA256) {
Sha256Final(&hmac->hash.sha256, (byte*) hmac->innerHash); Sha256Final(&hmac->hash.sha256, (byte*) hmac->innerHash);
Sha256Update(&hmac->hash.sha256, (byte*) hmac->opad, MD5_BLOCK_SIZE); Sha256Update(&hmac->hash.sha256, (byte*) hmac->opad, SHA256_BLOCK_SIZE);
Sha256Update(&hmac->hash.sha256, (byte*) hmac->innerHash, Sha256Update(&hmac->hash.sha256, (byte*) hmac->innerHash,
SHA256_DIGEST_SIZE); SHA256_DIGEST_SIZE);

4
cyassl/ctaocrypt/hmac.h
View File

@@ -49,11 +49,11 @@ enum {
HMAC_BLOCK_SIZE = SHA384_BLOCK_SIZE HMAC_BLOCK_SIZE = SHA384_BLOCK_SIZE
#elif !defined(NO_SHA256) #elif !defined(NO_SHA256)
INNER_HASH_SIZE = SHA256_DIGEST_SIZE, INNER_HASH_SIZE = SHA256_DIGEST_SIZE,
HMAC_BLOCK_SIZE = MD5_BLOCK_SIZE, HMAC_BLOCK_SIZE = SHA256_BLOCK_SIZE,
SHA384 = 5 SHA384 = 5
#else #else
INNER_HASH_SIZE = SHA_DIGEST_SIZE, INNER_HASH_SIZE = SHA_DIGEST_SIZE,
HMAC_BLOCK_SIZE = MD5_BLOCK_SIZE, HMAC_BLOCK_SIZE = SHA_BLOCK_SIZE,
SHA256 = 2, /* hash type unique */ SHA256 = 2, /* hash type unique */
SHA384 = 5 SHA384 = 5
#endif #endif