summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2000-10-15 01:12:25 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2000-10-15 01:12:25 +0000
commit4a8a8b48760bdfb730852ee67912c83e75d80eaf (patch)
treeab5b0756319733da8571a0f1917009e7bf1fe5ca
parent225b2f2c5f227f84437c64bba2b21f8028432bfc (diff)
Forgot to commit this, necessary for AES support.
-rw-r--r--sys/crypto/cryptosoft.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/crypto/cryptosoft.c b/sys/crypto/cryptosoft.c
index 98098486706..92d65cb2827 100644
--- a/sys/crypto/cryptosoft.c
+++ b/sys/crypto/cryptosoft.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptosoft.c,v 1.14 2000/08/19 13:43:23 nate Exp $ */
+/* $OpenBSD: cryptosoft.c,v 1.15 2000/10/15 01:12:24 angelos Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -460,6 +460,11 @@ swcr_newsession(u_int32_t *sid, struct cryptoini *cri)
case CRYPTO_SKIPJACK_CBC:
txf = &enc_xform_skipjack;
+ goto enccommon;
+
+ case CRYPTO_RIJNDAEL128_CBC:
+ txf = &enc_xform_rijndael128;
+ goto enccommon;
enccommon:
txf->setkey(&((*swd)->sw_kschedule), cri->cri_key,
@@ -603,6 +608,7 @@ swcr_freesession(u_int64_t tid)
case CRYPTO_BLF_CBC:
case CRYPTO_CAST_CBC:
case CRYPTO_SKIPJACK_CBC:
+ case CRYPTO_RIJNDAEL128_CBC:
txf = swd->sw_exf;
if (swd->sw_kschedule)
@@ -720,6 +726,7 @@ swcr_process(struct cryptop *crp)
case CRYPTO_BLF_CBC:
case CRYPTO_CAST_CBC:
case CRYPTO_SKIPJACK_CBC:
+ case CRYPTO_RIJNDAEL128_CBC:
if ((crp->crp_etype = swcr_encdec(crd, sw, crp->crp_buf,
type)) != 0)
goto done;