From 082a4bab02eac6bae6c338f8a3673d8077282fba Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Sun, 4 Jun 2006 14:49:34 +0000 Subject: - Remove HMAC_BLOCK_LEN, it serves no purpose. - Use defines of used algorithm instead of HMAC_BLOCK_LEN. --- sys/dev/ubsec/ubsec.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sys/dev/ubsec') diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c index 343e7730e9f5..d2e89d227fc5 100644 --- a/sys/dev/ubsec/ubsec.c +++ b/sys/dev/ubsec/ubsec.c @@ -864,12 +864,13 @@ ubsec_setup_mackey(struct ubsec_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)); } @@ -879,12 +880,13 @@ ubsec_setup_mackey(struct ubsec_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)); } -- cgit v1.3