diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-11-17 04:07:06 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-11-17 04:07:06 +0000 |
| commit | fc2a8fa9ef8f4f2965cbf28fa06d8124b6e00de2 (patch) | |
| tree | 14cac47079a1c0384de538826602f4938611cbf3 /sys/crypto/cryptosoft.c | |
| parent | 0d350435604346cacde1197af1e7c22c7418cecd (diff) | |
*HMAC96->*HMAC
Diffstat (limited to 'sys/crypto/cryptosoft.c')
| -rw-r--r-- | sys/crypto/cryptosoft.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sys/crypto/cryptosoft.c b/sys/crypto/cryptosoft.c index 1435d8f9005..770259768e0 100644 --- a/sys/crypto/cryptosoft.c +++ b/sys/crypto/cryptosoft.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptosoft.c,v 1.16 2000/11/09 14:26:24 art Exp $ */ +/* $OpenBSD: cryptosoft.c,v 1.17 2000/11/17 04:07:05 angelos Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -338,9 +338,9 @@ swcr_authcompute(struct cryptodesc *crd, struct swcr_data *sw, switch (sw->sw_alg) { - case CRYPTO_MD5_HMAC96: - case CRYPTO_SHA1_HMAC96: - case CRYPTO_RIPEMD160_HMAC96: + case CRYPTO_MD5_HMAC: + case CRYPTO_SHA1_HMAC: + case CRYPTO_RIPEMD160_HMAC: if (sw->sw_octx == NULL) return EINVAL; @@ -481,15 +481,15 @@ swcr_newsession(u_int32_t *sid, struct cryptoini *cri) get_random_bytes((*swd)->sw_iv, txf->blocksize); break; - case CRYPTO_MD5_HMAC96: + case CRYPTO_MD5_HMAC: axf = &auth_hash_hmac_md5_96; goto authcommon; - case CRYPTO_SHA1_HMAC96: + case CRYPTO_SHA1_HMAC: axf = &auth_hash_hmac_sha1_96; goto authcommon; - case CRYPTO_RIPEMD160_HMAC96: + case CRYPTO_RIPEMD160_HMAC: axf = &auth_hash_hmac_ripemd_160_96; authcommon: @@ -618,9 +618,9 @@ swcr_freesession(u_int64_t tid) free(swd->sw_iv, M_XDATA); break; - case CRYPTO_MD5_HMAC96: - case CRYPTO_SHA1_HMAC96: - case CRYPTO_RIPEMD160_HMAC96: + case CRYPTO_MD5_HMAC: + case CRYPTO_SHA1_HMAC: + case CRYPTO_RIPEMD160_HMAC: axf = swd->sw_axf; if (swd->sw_ictx) @@ -732,9 +732,9 @@ swcr_process(struct cryptop *crp) goto done; break; - case CRYPTO_MD5_HMAC96: - case CRYPTO_SHA1_HMAC96: - case CRYPTO_RIPEMD160_HMAC96: + case CRYPTO_MD5_HMAC: + case CRYPTO_SHA1_HMAC: + case CRYPTO_RIPEMD160_HMAC: case CRYPTO_MD5_KPDK: case CRYPTO_SHA1_KPDK: if ((crp->crp_etype = swcr_authcompute(crd, sw, crp->crp_buf, @@ -780,9 +780,9 @@ swcr_init(void) crypto_register(swcr_id, CRYPTO_BLF_CBC, NULL, NULL, NULL); crypto_register(swcr_id, CRYPTO_CAST_CBC, NULL, NULL, NULL); crypto_register(swcr_id, CRYPTO_SKIPJACK_CBC, NULL, NULL, NULL); - crypto_register(swcr_id, CRYPTO_MD5_HMAC96, NULL, NULL, NULL); - crypto_register(swcr_id, CRYPTO_SHA1_HMAC96, NULL, NULL, NULL); - crypto_register(swcr_id, CRYPTO_RIPEMD160_HMAC96, NULL, NULL, NULL); + crypto_register(swcr_id, CRYPTO_MD5_HMAC, NULL, NULL, NULL); + crypto_register(swcr_id, CRYPTO_SHA1_HMAC, NULL, NULL, NULL); + crypto_register(swcr_id, CRYPTO_RIPEMD160_HMAC, NULL, NULL, NULL); crypto_register(swcr_id, CRYPTO_MD5_KPDK, NULL, NULL, NULL); crypto_register(swcr_id, CRYPTO_SHA1_KPDK, NULL, NULL, NULL); crypto_register(swcr_id, CRYPTO_RIJNDAEL128_CBC, NULL, NULL, NULL); |