diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-10-09 22:20:42 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-10-09 22:20:42 +0000 |
| commit | dd8a2708728ea2f23889c616e8d0e8a2d0b86582 (patch) | |
| tree | c1aa9fe205dcab0678d9787ca87db12c43716af9 /sys | |
| parent | 710390020eadc827aa12d05d4ff5d71ccd9f396f (diff) | |
AES support.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/ip_esp.c | 6 | ||||
| -rw-r--r-- | sys/netinet/ip_ipsp.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c index a64ff79fdd6..c0821f1c735 100644 --- a/sys/netinet/ip_esp.c +++ b/sys/netinet/ip_esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp.c,v 1.49 2000/09/19 03:20:58 angelos Exp $ */ +/* $OpenBSD: ip_esp.c,v 1.50 2000/10/09 22:20:40 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -122,6 +122,10 @@ esp_init(struct tdb *tdbp, struct xformsw *xsp, struct ipsecinit *ii) txform = &enc_xform_3des; break; + case SADB_X_EALG_AES: + txform = &enc_xform_rijndael128; + break; + case SADB_X_EALG_BLF: txform = &enc_xform_blf; break; diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h index f0f0854a8df..c5ff3ac2358 100644 --- a/sys/netinet/ip_ipsp.h +++ b/sys/netinet/ip_ipsp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.h,v 1.72 2000/09/20 19:13:17 angelos Exp $ */ +/* $OpenBSD: ip_ipsp.h,v 1.73 2000/10/09 22:20:41 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -86,7 +86,7 @@ union sockaddr_union #define IPSEC_DEFAULT_EXP_TIMEOUT 86400 #define IPSEC_DEFAULT_SOFT_FIRST_USE 3600 #define IPSEC_DEFAULT_EXP_FIRST_USE 7200 -#define IPSEC_DEFAULT_DEF_ENC "3des" +#define IPSEC_DEFAULT_DEF_ENC "aes" #define IPSEC_DEFAULT_DEF_AUTH "hmac-sha1" #define IPSEC_DEFAULT_EXPIRE_ACQUIRE 30 |