diff options
| author |   miod <miod@openbsd.org> | 2015-02-10 09:52:35 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2015-02-10 09:52:35 +0000 |
| commit | 8ad85bf285ce705d205f8dba3343f60dcaff0145 (patch) | |
| tree | fe6aaa1f00bc3bcf6aaaa3ec7a456319db838b5a /lib/libcrypto/hmac/hmac.c | |
| parent | Remove default value initialisers for ASN1_ITEM. Minor changes to generated (diff) | |
| download | wireguard-openbsd-8ad85bf285ce705d205f8dba3343f60dcaff0145.tar.xz wireguard-openbsd-8ad85bf285ce705d205f8dba3343f60dcaff0145.zip | |
Replace assert() and OPENSSL_assert() calls with proper error return paths.
Careful review, feedback & ok doug@ jsing@
Diffstat (limited to 'lib/libcrypto/hmac/hmac.c')
| -rw-r--r-- | lib/libcrypto/hmac/hmac.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/libcrypto/hmac/hmac.c b/lib/libcrypto/hmac/hmac.c index f2e5f149e0c..155e32a540c 100644 --- a/lib/libcrypto/hmac/hmac.c +++ b/lib/libcrypto/hmac/hmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hmac.c,v 1.21 2014/07/11 08:44:48 jsing Exp $ */ +/* $OpenBSD: hmac.c,v 1.22 2015/02/10 09:52:35 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,6 +60,7 @@ #include <stdlib.h> #include <string.h> +#include <openssl/err.h> #include <openssl/hmac.h> int @@ -78,7 +79,10 @@ HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, if (key != NULL) { reset = 1; j = EVP_MD_block_size(md); - OPENSSL_assert(j <= (int)sizeof(ctx->key)); + if ((size_t)j > sizeof(ctx->key)) { + EVPerr(EVP_F_HMAC_INIT_EX, EVP_R_BAD_BLOCK_LENGTH); + goto err; + } if (j < len) { if (!EVP_DigestInit_ex(&ctx->md_ctx, md, impl)) goto err; @@ -88,8 +92,11 @@ HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, &ctx->key_length)) goto err; } else { - OPENSSL_assert(len >= 0 && - len <= (int)sizeof(ctx->key)); + if ((size_t)len > sizeof(ctx->key)) { + EVPerr(EVP_F_HMAC_INIT_EX, + EVP_R_BAD_KEY_LENGTH); + goto err; + } memcpy(ctx->key, key, len); ctx->key_length = len; } |