diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-10-09 22:17:31 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-10-09 22:17:31 +0000 |
| commit | 1410b93a62b49ecd27b1fd8a8a00d79a16f6d7a3 (patch) | |
| tree | 7f6143eab4015122df5bba8457f8629898b6b710 | |
| parent | 2d02b13a520c2c8c3bf1c47b80d8b8735ae7964f (diff) | |
AES alias for Rijndael, also adjust the name.
| -rw-r--r-- | sys/crypto/crypto.h | 1 | ||||
| -rw-r--r-- | sys/crypto/xform.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/crypto/crypto.h b/sys/crypto/crypto.h index 2e828b89771..e3c218b7ade 100644 --- a/sys/crypto/crypto.h +++ b/sys/crypto/crypto.h @@ -58,6 +58,7 @@ #define CRYPTO_MD5_KPDK 9 #define CRYPTO_SHA1_KPDK 10 #define CRYPTO_RIJNDAEL128_CBC 11 /* 128 bit blocksize */ +#define CRYPTO_AES_CBC 11 /* 128 bit blocksize -- the same as above */ #define CRYPTO_ALGORITHM_MAX 11 /* Keep this updated */ diff --git a/sys/crypto/xform.c b/sys/crypto/xform.c index 6a7ffec92f5..861614580a3 100644 --- a/sys/crypto/xform.c +++ b/sys/crypto/xform.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xform.c,v 1.2 2000/06/18 08:37:11 angelos Exp $ */ +/* $OpenBSD: xform.c,v 1.3 2000/10/09 22:17:30 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -140,7 +140,7 @@ struct enc_xform enc_xform_skipjack = struct enc_xform enc_xform_rijndael128 = { - CRYPTO_RIJNDAEL128_CBC, "Rijndael-128", + CRYPTO_RIJNDAEL128_CBC, "Rijndael-128/AES", 16, 8, 32, 16, rijndael128_encrypt, rijndael128_decrypt, |