pjd 2006-05-17 18:24:17 UTC
FreeBSD src repository
Modified files:
sys/opencrypto cryptodev.c cryptodev.h cryptosoft.c
cryptosoft.h xform.c xform.h
Log:
- Fix a very old bug in HMAC/SHA{384,512}. When HMAC is using SHA384
or SHA512, the blocksize is 128 bytes, not 64 bytes as anywhere else.
The bug also exists in NetBSD, OpenBSD and various other independed
implementations I look at.
- We cannot decide which hash function to use for HMAC based on the key
length, because any HMAC function can use any key length.
To fix it split CRYPTO_SHA2_HMAC into three algorithm:
CRYPTO_SHA2_256_HMAC, CRYPTO_SHA2_384_HMAC and CRYPTO_SHA2_512_HMAC.
Those names are consistent with OpenBSD's naming.
- Remove authsize field from auth_hash structure.
- Allow consumer to define size of hash he wants to receive.
This allows to use HMAC not only for IPsec, where 96 bits MAC is requested.
The size of requested MAC is defined at newsession time in the cri_mlen
field - when 0, entire MAC will be returned.
- Add swcr_authprepare() function which prepares authentication key.
- Allow to provide key for every authentication operation, not only at
newsession time by honoring CRD_F_KEY_EXPLICIT flag.
- Make giving key at newsession time optional - don't try to operate on it
if its NULL.
- Extend COPYBACK()/COPYDATA() macros to handle CRYPTO_BUF_CONTIG buffer
type as well.
- Accept CRYPTO_BUF_IOV buffer type in swcr_authcompute() as we have
cuio_apply() now.
- 16 bits for key length (SW_klen) is more than enough.
Reviewed by: sam
Revision Changes Path
1.30 +12 -15 src/sys/opencrypto/cryptodev.c
1.14 +11 -6 src/sys/opencrypto/cryptodev.h
1.12 +147 -89 src/sys/opencrypto/cryptosoft.c
1.3 +5 -3 src/sys/opencrypto/cryptosoft.h
1.7 +15 -15 src/sys/opencrypto/xform.c
1.3 +4 -4 src/sys/opencrypto/xform.h