kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove gotos from HMAC code.

Browse Source 
Change-Id: Ic17257e65207ada658f781f4b35ec0cf75bb5474
Reviewed-on: https://boringssl-review.googlesource.com/4151
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Brian Smith 2015-03-17 22:15:17 -10:00 committed by Adam Langley
parent dd973b2364
commit 8983a1da7b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/hmac/hmac.c
View File

@ -126,7 +126,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, size_t key_len,
if (!EVP_DigestInit_ex(&ctx->md_ctx, md, impl) || if (!EVP_DigestInit_ex(&ctx->md_ctx, md, impl) ||
!EVP_DigestUpdate(&ctx->md_ctx, key, key_len) || !EVP_DigestUpdate(&ctx->md_ctx, key, key_len) ||
!EVP_DigestFinal_ex(&ctx->md_ctx, key_block, &key_block_len)) { !EVP_DigestFinal_ex(&ctx->md_ctx, key_block, &key_block_len)) {
goto err; return 0;
} }
} else { } else {
assert(key_len >= 0 && key_len <= sizeof(key_block)); assert(key_len >= 0 && key_len <= sizeof(key_block));
@ -143,7 +143,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, size_t key_len,
} }
if (!EVP_DigestInit_ex(&ctx->i_ctx, md, impl) || if (!EVP_DigestInit_ex(&ctx->i_ctx, md, impl) ||
!EVP_DigestUpdate(&ctx->i_ctx, pad, EVP_MD_block_size(md))) { !EVP_DigestUpdate(&ctx->i_ctx, pad, EVP_MD_block_size(md))) {
goto err; return 0;
} }
for (i = 0; i < HMAC_MAX_MD_CBLOCK; i++) { for (i = 0; i < HMAC_MAX_MD_CBLOCK; i++) {
@ -151,20 +151,17 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, size_t key_len,
} }
if (!EVP_DigestInit_ex(&ctx->o_ctx, md, impl) || if (!EVP_DigestInit_ex(&ctx->o_ctx, md, impl) ||
!EVP_DigestUpdate(&ctx->o_ctx, pad, EVP_MD_block_size(md))) { !EVP_DigestUpdate(&ctx->o_ctx, pad, EVP_MD_block_size(md))) {
goto err; return 0;
} }
ctx->md = md; ctx->md = md;
} }
if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx, &ctx->i_ctx)) { if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx, &ctx->i_ctx)) {
goto err; return 0;
} }
return 1; return 1;
err:
return 0;
} }
int HMAC_Update(HMAC_CTX *ctx, const uint8_t *data, size_t data_len) { int HMAC_Update(HMAC_CTX *ctx, const uint8_t *data, size_t data_len) {