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 /include/openssl/hmac.h | |
| 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 'include/openssl/hmac.h')
| -rw-r--r-- | include/openssl/hmac.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h index e521212d..5a4e9c7f 100644 --- a/include/openssl/hmac.h +++ b/include/openssl/hmac.h @@ -143,8 +143,6 @@ OPENSSL_EXPORT int HMAC_CTX_copy(HMAC_CTX *dest, const HMAC_CTX *src); /* Private functions */ -#define HMAC_MAX_MD_CBLOCK 128 /* largest known is SHA512 */ - struct hmac_ctx_st { const EVP_MD *md; EVP_MD_CTX md_ctx; |