- Remove HMAC_BLOCK_LEN, it serves no purpose.

- Use defines of used algorithm instead of HMAC_BLOCK_LEN.

1 files changed, 6 insertions, 4 deletions

diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index 080955d..2c887fc 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -667,12 +667,13 @@ safe_setup_mackey(struct safe_session *ses, int algo, caddr_t key, int klen)
 	if (algo == CRYPTO_MD5_HMAC) {
 		MD5Init(&md5ctx);
 		MD5Update(&md5ctx, key, klen);
-		MD5Update(&md5ctx, hmac_ipad_buffer, HMAC_BLOCK_LEN - klen);
+		MD5Update(&md5ctx, hmac_ipad_buffer, MD5_HMAC_BLOCK_LEN - klen);
 		bcopy(md5ctx.state, ses->ses_hminner, sizeof(md5ctx.state));
 	} else {
 		SHA1Init(&sha1ctx);
 		SHA1Update(&sha1ctx, key, klen);
-		SHA1Update(&sha1ctx, hmac_ipad_buffer, HMAC_BLOCK_LEN - klen);
+		SHA1Update(&sha1ctx, hmac_ipad_buffer,
+		    SHA1_HMAC_BLOCK_LEN - klen);
 		bcopy(sha1ctx.h.b32, ses->ses_hminner, sizeof(sha1ctx.h.b32));
 	}
 
@@ -682,12 +683,13 @@ safe_setup_mackey(struct safe_session *ses, int algo, caddr_t key, int klen)
 	if (algo == CRYPTO_MD5_HMAC) {
 		MD5Init(&md5ctx);
 		MD5Update(&md5ctx, key, klen);
-		MD5Update(&md5ctx, hmac_opad_buffer, HMAC_BLOCK_LEN - klen);
+		MD5Update(&md5ctx, hmac_opad_buffer, MD5_HMAC_BLOCK_LEN - klen);
 		bcopy(md5ctx.state, ses->ses_hmouter, sizeof(md5ctx.state));
 	} else {
 		SHA1Init(&sha1ctx);
 		SHA1Update(&sha1ctx, key, klen);
-		SHA1Update(&sha1ctx, hmac_opad_buffer, HMAC_BLOCK_LEN - klen);
+		SHA1Update(&sha1ctx, hmac_opad_buffer,
+		    SHA1_HMAC_BLOCK_LEN - klen);
 		bcopy(sha1ctx.h.b32, ses->ses_hmouter, sizeof(sha1ctx.h.b32));
 	}