diff options
| author | David Benjamin <davidben@google.com> | 2016-04-17 00:10:01 +0300 |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2016-04-19 21:16:38 +0300 |
| commit | 582d2847eda65671883649347f60f6916838a3d1 (patch) | |
| tree | d314bd548681430ec52497ddf68b001680e843a7 /crypto/hmac | |
| parent | 0e21f41fe884bedf708d3d4d6ab2ce9f53712bb8 (diff) | |
Reimplement PKCS#12 key derivation.
This is avoids pulling in BIGNUM for doing a straight-forward addition on a
block-sized value, and avoids a ton of mallocs. It's also -Wconversion-clean,
unlike the old one.
In doing so, this replaces the HMAC_MAX_MD_CBLOCK with EVP_MAX_MD_BLOCK_SIZE.
By having the maximum block size available, most of the temporary values in the
key derivation don't need to be malloc'd.
BUG=22
Change-Id: I940a62bba4ea32bf82b1190098f3bf185d4cc7fe
Reviewed-on: https://boringssl-review.googlesource.com/7688
Reviewed-by: Steven Valdez <svaldez@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Diffstat (limited to 'crypto/hmac')
| -rw-r--r-- | crypto/hmac/hmac.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c index be2dccec..bccc5c02 100644 --- a/crypto/hmac/hmac.c +++ b/crypto/hmac/hmac.c @@ -59,6 +59,7 @@ #include <assert.h> #include <string.h> +#include <openssl/digest.h> #include <openssl/mem.h> @@ -115,8 +116,8 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, size_t key_len, * case. Fix to API to avoid this. */ if (md != ctx->md || key != NULL) { size_t i; - uint8_t pad[HMAC_MAX_MD_CBLOCK]; - uint8_t key_block[HMAC_MAX_MD_CBLOCK]; + uint8_t pad[EVP_MAX_MD_BLOCK_SIZE]; + uint8_t key_block[EVP_MAX_MD_BLOCK_SIZE]; unsigned key_block_len; size_t block_size = EVP_MD_block_size(md); @@ -134,11 +135,11 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, size_t key_len, key_block_len = (unsigned)key_len; } /* Keys are then padded with zeros. */ - if (key_block_len != HMAC_MAX_MD_CBLOCK) { + if (key_block_len != EVP_MAX_MD_BLOCK_SIZE) { memset(&key_block[key_block_len], 0, sizeof(key_block) - key_block_len); } - for (i = 0; i < HMAC_MAX_MD_CBLOCK; i++) { + for (i = 0; i < EVP_MAX_MD_BLOCK_SIZE; i++) { pad[i] = 0x36 ^ key_block[i]; } if (!EVP_DigestInit_ex(&ctx->i_ctx, md, impl) || @@ -146,7 +147,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, size_t key_len, return 0; } - for (i = 0; i < HMAC_MAX_MD_CBLOCK; i++) { + for (i = 0; i < EVP_MAX_MD_BLOCK_SIZE; i++) { pad[i] = 0x5c ^ key_block[i]; } if (!EVP_DigestInit_ex(&ctx->o_ctx, md, impl) || |