Merge with EOM 1.20

author: angelos
Add "phase1_group_desc" attribute, and explain the various values.

1 files changed, 8 insertions, 2 deletions

diff --git a/sbin/isakmpd/isakmpd.policy.5 b/sbin/isakmpd/isakmpd.policy.5
index 5a95ab166ea..a02e95cee7b 100644
--- a/sbin/isakmpd/isakmpd.policy.5
+++ b/sbin/isakmpd/isakmpd.policy.5
@@ -1,5 +1,5 @@
-.\" $OpenBSD: isakmpd.policy.5,v 1.10 2000/06/08 20:52:09 niklas Exp $
-.\" $EOM: isakmpd.policy.5,v 1.19 2000/05/26 21:50:26 angelos Exp $
+.\" $OpenBSD: isakmpd.policy.5,v 1.11 2000/08/03 07:24:37 niklas Exp $
+.\" $EOM: isakmpd.policy.5,v 1.20 2000/07/26 05:26:31 angelos Exp $
 .\"
 .\" Copyright (c) 1999, Angelos D. Keromytis.  All rights reserved.
 .\"
@@ -381,6 +381,12 @@ proposal, used for PFS during Quick Mode (see the pfs attribute
 above).
 If more than one of these attributes are set to a value other
 than zero, they should have the same value (in valid IKE proposals).
+Valid values are 1 (768-bit MODP), 2 (1024-bit MODP), 3 (155-bit EC),
+4 (185-bit EC), and 5 (1536-bit MODP).
+.It phase1_group_desc
+The Diffie-Hellman group identifier used in IKE Phase 1.
+Takes the same values as
+.Va ah_group_desc .
 .It remote_filter_type, local_filter_type, remote_id_type
 Set to
 .Va IPv4 address ,