diff options
| author | gnn <gnn@FreeBSD.org> | 2007-05-09 19:37:02 +0000 |
|---|---|---|
| committer | gnn <gnn@FreeBSD.org> | 2007-05-09 19:37:02 +0000 |
| commit | 38b76f06232a188e2b053370458b6901b745948b (patch) | |
| tree | ab6a97da261f87bb2e97c008d467da3311010b9e /sys/opencrypto/cryptosoft.c | |
| parent | 4941ee4a2accc1d1a5d38148ec1378487b9e1cf0 (diff) | |
| download | FreeBSD-src-38b76f06232a188e2b053370458b6901b745948b.zip FreeBSD-src-38b76f06232a188e2b053370458b6901b745948b.tar.gz | |
Integrate the Camellia Block Cipher. For more information see RFC 4132
and its bibliography.
Submitted by: Tomoyuki Okazaki <okazaki at kick dot gr dot jp>
MFC after: 1 month
Diffstat (limited to 'sys/opencrypto/cryptosoft.c')
| -rw-r--r-- | sys/opencrypto/cryptosoft.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c index 9de2350..ba83718 100644 --- a/sys/opencrypto/cryptosoft.c +++ b/sys/opencrypto/cryptosoft.c @@ -661,6 +661,9 @@ swcr_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri) case CRYPTO_RIJNDAEL128_CBC: txf = &enc_xform_rijndael128; goto enccommon; + case CRYPTO_CAMELLIA_CBC: + txf = &enc_xform_camellia; + goto enccommon; case CRYPTO_NULL_CBC: txf = &enc_xform_null; goto enccommon; @@ -816,6 +819,7 @@ swcr_freesession(device_t dev, u_int64_t tid) case CRYPTO_CAST_CBC: case CRYPTO_SKIPJACK_CBC: case CRYPTO_RIJNDAEL128_CBC: + case CRYPTO_CAMELLIA_CBC: case CRYPTO_NULL_CBC: txf = swd->sw_exf; @@ -928,6 +932,7 @@ swcr_process(device_t dev, struct cryptop *crp, int hint) case CRYPTO_CAST_CBC: case CRYPTO_SKIPJACK_CBC: case CRYPTO_RIJNDAEL128_CBC: + case CRYPTO_CAMELLIA_CBC: if ((crp->crp_etype = swcr_encdec(crd, sw, crp->crp_buf, crp->crp_flags)) != 0) goto done; @@ -1019,6 +1024,7 @@ swcr_attach(device_t dev) REGISTER(CRYPTO_MD5); REGISTER(CRYPTO_SHA1); REGISTER(CRYPTO_RIJNDAEL128_CBC); + REGISTER(CRYPTO_CAMELLIA_CBC); REGISTER(CRYPTO_DEFLATE_COMP); #undef REGISTER |
