diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-09 23:27:00 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-09 23:27:00 +0000 |
| commit | 81e057add4192afbc15f624f83c42062d435661f (patch) | |
| tree | ef7777e8954b8e509fafbcd5bbd2ee293280cd73 /sbin/isakmpd | |
| parent | c917845b5b6cca93d4a7cedcd995757984f20b83 (diff) | |
Merge with EOM 1.48
author: niklas
properly ifdef PF_KEY extension
author: angelos
AES support.
Diffstat (limited to 'sbin/isakmpd')
| -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; |