diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 00:37:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 00:37:00 +0000 |
| commit | 00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872 (patch) | |
| tree | dc62c249d595198e0d99e43890019d21e901fbec /src/crypto/hkdf/hkdf.c | |
| parent | 3781a60670f92c3c6fca860cb4589495cefa2e56 (diff) | |
| parent | a04d78d392463df4e69a64360c952ffa5abd22f7 (diff) | |
| download | external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.zip external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.tar.gz external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.tar.bz2 | |
am a04d78d3: Revert "external/boringssl: sync with upstream."
* commit 'a04d78d392463df4e69a64360c952ffa5abd22f7':
Revert "external/boringssl: sync with upstream."
Diffstat (limited to 'src/crypto/hkdf/hkdf.c')
| -rw-r--r-- | src/crypto/hkdf/hkdf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/crypto/hkdf/hkdf.c b/src/crypto/hkdf/hkdf.c index f9cdcb0..bb7f5a4 100644 --- a/src/crypto/hkdf/hkdf.c +++ b/src/crypto/hkdf/hkdf.c @@ -40,7 +40,7 @@ int HKDF(uint8_t *out_key, size_t out_len, /* Expand key material to desired length. */ n = (out_len + digest_len - 1) / digest_len; if (out_len + digest_len < out_len || n > 255) { - OPENSSL_PUT_ERROR(HKDF, HKDF_R_OUTPUT_TOO_LARGE); + OPENSSL_PUT_ERROR(HKDF, HKDF, HKDF_R_OUTPUT_TOO_LARGE); return 0; } @@ -83,7 +83,7 @@ int HKDF(uint8_t *out_key, size_t out_len, out: HMAC_CTX_cleanup(&hmac); if (ret != 1) { - OPENSSL_PUT_ERROR(HKDF, ERR_R_HMAC_LIB); + OPENSSL_PUT_ERROR(HKDF, HKDF, ERR_R_HMAC_LIB); } return ret; } |