Page MenuHomeFreeBSD
Files F152936108

D30001.id88218.diff
No OneTemporary
Actions

D30001.id88218.diff
View Options

diff --git a/sys/crypto/aesni/aesni.h b/sys/crypto/aesni/aesni.h
--- a/sys/crypto/aesni/aesni.h
+++ b/sys/crypto/aesni/aesni.h
@@ -52,12 +52,15 @@
#define AES256_ROUNDS 14
#define AES_SCHED_LEN ((AES256_ROUNDS + 1) * AES_BLOCK_LEN)
+/* SHA1, SHA2-224 and SHA2-256 only. */
+#define AESNI_SHA_BLOCK_LEN 64
+
struct aesni_session {
uint8_t enc_schedule[AES_SCHED_LEN] __aligned(16);
uint8_t dec_schedule[AES_SCHED_LEN] __aligned(16);
uint8_t xts_schedule[AES_SCHED_LEN] __aligned(16);
/* Same as the SHA256 Blocksize. */
- uint8_t hmac_key[SHA1_BLOCK_LEN] __aligned(16);
+ uint8_t hmac_key[AESNI_SHA_BLOCK_LEN];
int algo;
int rounds;
/* uint8_t *ses_ictx; */
diff --git a/sys/crypto/aesni/aesni.c b/sys/crypto/aesni/aesni.c
--- a/sys/crypto/aesni/aesni.c
+++ b/sys/crypto/aesni/aesni.c
@@ -655,10 +655,10 @@
{
size_t i;
- for (i = 0; i < 64; i++)
+ for (i = 0; i < AESNI_SHA_BLOCK_LEN; i++)
key[i] ^= xorbyte;
- update(ctx, key, 64);
- for (i = 0; i < 64; i++)
+ update(ctx, key, AESNI_SHA_BLOCK_LEN);
+ for (i = 0; i < AESNI_SHA_BLOCK_LEN; i++)
key[i] ^= xorbyte;
crypto_apply(crpflags, __DECONST(void *, buf), off, buflen,
@@ -883,6 +883,7 @@
struct SHA256Context sha2 __aligned(16);
struct sha1_ctxt sha1 __aligned(16);
} sctx;
+ uint8_t hmac_key[AESNI_SHA_BLOCK_LEN] __aligned(16);
uint32_t res[SHA2_256_HASH_LEN / sizeof(uint32_t)];
int hashlen, error;
void *ctx;
@@ -946,15 +947,16 @@
}
if (hmac) {
+ memcpy(hmac_key, ses->hmac_key, AESNI_SHA_BLOCK_LEN);
+
/* Inner hash: (K ^ IPAD) || data */
InitFn(ctx);
- hmac_internal(ctx, res, UpdateFn, FinalizeFn, ses->hmac_key,
- 0x36, crp->crp_buf, crd->crd_skip, crd->crd_len,
- crp->crp_flags);
+ hmac_internal(ctx, res, UpdateFn, FinalizeFn, hmac_key, 0x36,
+ crp->crp_buf, crd->crd_skip, crd->crd_len, crp->crp_flags);
/* Outer hash: (K ^ OPAD) || inner hash */
InitFn(ctx);
- hmac_internal(ctx, res, UpdateFn, FinalizeFn, ses->hmac_key,
- 0x5C, res, 0, hashlen, 0);
+ hmac_internal(ctx, res, UpdateFn, FinalizeFn, hmac_key, 0x5C,
+ res, 0, hashlen, 0);
} else {
InitFn(ctx);
crypto_apply(crp->crp_flags, crp->crp_buf, crd->crd_skip,

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 4:39 AM (2 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31746394
Default Alt Text
D30001.id88218.diff (2 KB)

Event Timeline