diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2010-11-15 12:57:25 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2010-11-15 12:57:25 +0000 |
| commit | 714fb65665bb4b05da864e1576461968c7048cc8 (patch) | |
| tree | 0ee62551cd4ecf5dc103f69d0923edc9c91f6062 /sys | |
| parent | e838fa0e267ba7d57b503ee187136772062402d4 (diff) | |
convert one if-else instance to the switch to ease gcm integration;
use proper define for the initial counter block
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/aesni.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/arch/amd64/amd64/aesni.c b/sys/arch/amd64/amd64/aesni.c index 1b788674ddb..1b52cc01ff3 100644 --- a/sys/arch/amd64/amd64/aesni.c +++ b/sys/arch/amd64/amd64/aesni.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aesni.c,v 1.12 2010/11/15 12:30:29 mikeb Exp $ */ +/* $OpenBSD: aesni.c,v 1.13 2010/11/15 12:57:24 mikeb Exp $ */ /*- * Copyright (c) 2003 Jason Wright * Copyright (c) 2003, 2004 Theo de Raadt @@ -313,7 +313,7 @@ aesni_encdec(struct cryptop *crp, struct cryptodesc *crd, struct aesni_sess *ses) { uint8_t iv[EALG_MAX_BLOCK_LEN]; - uint8_t icb[EALG_MAX_BLOCK_LEN]; + uint8_t icb[AESCTR_BLOCKSIZE]; uint8_t *buf = aesni_sc->sc_buf; int ivlen, rlen, err = 0; @@ -382,16 +382,19 @@ aesni_encdec(struct cryptop *crp, struct cryptodesc *crd, /* Apply cipher */ fpu_kernel_enter(); - if (crd->crd_alg == CRYPTO_AES_CBC) { + switch (crd->crd_alg) { + case CRYPTO_AES_CBC: if (crd->crd_flags & CRD_F_ENCRYPT) aesni_cbc_enc(ses, buf, buf, crd->crd_len, iv); else aesni_cbc_dec(ses, buf, buf, crd->crd_len, iv); - } else if (crd->crd_alg == CRYPTO_AES_CTR) { - bzero(icb, sizeof(icb)); + break; + case CRYPTO_AES_CTR: + bzero(icb, AESCTR_BLOCKSIZE); bcopy(ses->ses_nonce, icb, AESCTR_NONCESIZE); bcopy(iv, icb + AESCTR_NONCESIZE, AESCTR_IVSIZE); aesni_ctr_enc(ses, buf, buf, crd->crd_len, icb); + break; } fpu_kernel_exit(); |