diff options
| author |   niklas <niklas@openbsd.org> | 2000-10-09 23:26:59 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 2000-10-09 23:26:59 +0000 |
| commit | 271683fee5d132f71d606d04da8b4e654715ea13 (patch) | |
| tree | 9140eb5847ee7074d4f5ea2abbd15098ec090f30 | |
| parent | crank maxproc for staff login class (diff) | |
| download | wireguard-openbsd-271683fee5d132f71d606d04da8b4e654715ea13.tar.xz wireguard-openbsd-271683fee5d132f71d606d04da8b4e654715ea13.zip | |
Merge with EOM 1.48
author: niklas
properly ifdef PF_KEY extension
author: angelos
AES support.
| -rw-r--r-- | sbin/isakmpd/pf_key_v2.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c index 7057fe5ecc2..06d3ec7d2b9 100644 --- a/sbin/isakmpd/pf_key_v2.c +++ b/sbin/isakmpd/pf_key_v2.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pf_key_v2.c,v 1.30 2000/10/07 06:57:56 niklas Exp $ */ -/* $EOM: pf_key_v2.c,v 1.46 2000/10/07 06:46:55 niklas Exp $ */ +/* $OpenBSD: pf_key_v2.c,v 1.31 2000/10/09 23:26:59 niklas Exp $ */ +/* $EOM: pf_key_v2.c,v 1.48 2000/10/09 23:24:23 niklas Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -755,6 +755,12 @@ pf_key_v2_set_spi (struct sa *sa, struct proto *proto, int incoming) ssa.sadb_sa_encrypt = SADB_EALG_3DESCBC; break; +#ifdef SADB_X_EALG_AES + case IPSEC_ESP_AES: + ssa.sadb_sa_encrypt = SADB_X_EALG_AES; + break; +#endif + #ifdef SADB_X_EALG_CAST case IPSEC_ESP_CAST: ssa.sadb_sa_encrypt = SADB_X_EALG_CAST; |