diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-12-12 01:45:56 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-12-12 01:45:56 +0000 |
| commit | d0fe2215ae8007bbe6f20aa8c30cc173089389c0 (patch) | |
| tree | 61be819d7c5b181e8b4f3b81607d7bd1df47ba43 /sbin | |
| parent | 74264be621a1e7d2b72381b5c727b73bd3ed35b5 (diff) | |
Merge with EOM 1.48
author: angelos
Add Default-phase-1-ID tag in [General], and document its use.
author: angelos
Default Phase 1 entry.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/conf.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c index 20a3967dd64..3d725dc8eca 100644 --- a/sbin/isakmpd/conf.c +++ b/sbin/isakmpd/conf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: conf.c,v 1.24 2000/10/27 19:22:36 niklas Exp $ */ -/* $EOM: conf.c,v 1.46 2000/10/26 16:17:19 ho Exp $ */ +/* $OpenBSD: conf.c,v 1.25 2000/12/12 01:45:55 niklas Exp $ */ +/* $EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $ */ /* * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -411,6 +411,21 @@ conf_load_defaults (int tr) conf_set (tr, sect, "Life", CONF_DFLT_TAG_LIFE_MAIN_MODE, 0, 1); } + /* Setup a default Phase 1 entry */ + conf_set (tr, "Phase 1", "Default", "Default-phase-1", 0, 1); + + conf_set (tr, "Default-phase-1", "Phase", "1", 0, 1); + conf_set (tr, "Default-phase-1", "Configuration", + "Default-phase-1-configuration", 0, 1); + dflt = conf_get_str ("General", "Default-phase-1-ID"); + if (dflt) + conf_set (tr, "Default-phase-1", "ID", dflt, 0, 1); + + conf_set (tr, "Default-phase-1-configuration", + "EXCHANGE_TYPE", "ID_PROT", 0, 1); + conf_set (tr, "Default-phase-1-configuration", "Transforms", + "3DES-SHA-RSA_SIG", 0, 1); + /* Quick modes */ for (enc = 0; qm_enc[enc]; enc ++) for (proto = 0; proto < 2; proto ++) |